diff --git a/app/imports/ui/properties/PropertyViewer.vue b/app/imports/ui/properties/PropertyViewer.vue
index 730b37c0..5ead802f 100644
--- a/app/imports/ui/properties/PropertyViewer.vue
+++ b/app/imports/ui/properties/PropertyViewer.vue
@@ -1,10 +1,13 @@
 <template lang="html">
 	<component
-		v-if="model"
+		v-if="model && $options.components[model.type]"
 		class="property-viewer"
 		:is="model.type"
 		:model="model"
 	/>
+	<div v-else-if="model">
+		This property can't be viewed yet.
+	</div>
 </template>
 
 <script>