diff --git a/src/modules/icmaa-cms/components/Block.vue b/src/modules/icmaa-cms/components/Block.vue
index 078fba0704..85f3428c32 100644
--- a/src/modules/icmaa-cms/components/Block.vue
+++ b/src/modules/icmaa-cms/components/Block.vue
@@ -1,5 +1,5 @@
 <template>
-  <component :class="['cms-content']" :is="content" v-if="loaded" />
+  <component :class="['cms-content']" :is="content" v-if="loaded && isValidComponent" />
 </template>
 
 <script>
diff --git a/src/modules/icmaa-cms/mixins/Block.ts b/src/modules/icmaa-cms/mixins/Block.ts
index dee81e2826..a874315c3a 100644
--- a/src/modules/icmaa-cms/mixins/Block.ts
+++ b/src/modules/icmaa-cms/mixins/Block.ts
@@ -32,6 +32,9 @@ export default {
     },
     content (): object {
       return stringToComponent(this.block.content)
+    },
+    isValidComponent (): boolean {
+      return (this.content && Object.keys(this.content).length > 0)
     }
   },
   methods: {