diff --git a/src/components/DefElement.vue b/src/components/DefElement.vue
index 7a6a7930461d1519c530906b7803246c0201183a..82673335dccd5426f44d2f871374ce6d319c71a3 100644
--- a/src/components/DefElement.vue
+++ b/src/components/DefElement.vue
@@ -42,7 +42,7 @@ export default {
           else if (item.type_ == 'superscript') return {type: item.type_, html: item.text, tag: 'sup'}
           else if (item.type_ == 'subscript') return {type: item.type_, html: item.text, 'tag': 'sub'}
           else if (item.type_ == 'quote_inset') return {type: item.type_, body: item, html: '', tag: 'DefElement', props: {body: item, tag: 'i'}}
-          else if (item.id) return {type: item.type_, html: entities[lang][item.id]['expansion'] || item.id}
+          else if (item.id) return {type: item.type_, html: (entities[lang][item.id] || {})['expansion'] || item.id}
           else return {type: item.type_ || 'plain', html: item}
         }
       )
diff --git a/src/components/Preview.vue b/src/components/Preview.vue
index 11f534628aca8323c525a4178669a68d98792866..30defe7f9e91929d96aef51cd1afa5f1e31091aa 100644
--- a/src/components/Preview.vue
+++ b/src/components/Preview.vue
@@ -43,7 +43,7 @@ export default {
 
       let replacements = element.items.map(item => item.text ||
                                            item.string ||
-                                           entities[lang][item.id]['expansion'] ||
+                                           (entities[lang][item.id] || {})['expansion'] ||
                                            item.id ||
                                            item.lemmas[0].lemma).reverse()