diff --git a/components/Cms/Block/CmsBlockHtml.vue b/components/Cms/Block/CmsBlockHtml.vue
new file mode 100644
index 00000000..7f0b8772
--- /dev/null
+++ b/components/Cms/Block/CmsBlockHtml.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import type { Schemas } from '@shopware/api-client/api-types';
+
+const props = defineProps<{
+    block: Schemas['CmsBlock'];
+}>();
+
+const { getSlotContent } = useCmsBlock(props.block);
+const content: Schemas['CmsSlot'] = getSlotContent('content');
+</script>
+
+<template>
+    <CmsLoader :content="content" />
+</template>
diff --git a/components/Cms/Element/CmsElementHtml.vue b/components/Cms/Element/CmsElementHtml.vue
new file mode 100644
index 00000000..be7cd5ae
--- /dev/null
+++ b/components/Cms/Element/CmsElementHtml.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import type { CmsElementText } from '@shopware-pwa/composables-next';
+
+const props = defineProps<{
+    element: CmsElementText;
+}>();
+
+const config = useCmsElementConfig(props.element);
+const content = config.getConfigValue('content');
+</script>
+
+<template>
+    <!-- v-html is necessary because we need to render html -->
+    <!-- eslint-disable vue/no-v-html -->
+    <div v-html="content" />
+</template>