diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index e4e007567..380806540 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -58,8 +58,8 @@ onBeforeMount(async () => {
     store = arrayData.store;
     entity = computed(() => {
         const data = Array.isArray(store.data) ? store.data[0] : store.data;
-        emit('onFetch', data);
-        return data;
+        if (data) emit('onFetch', data ?? {});
+        return data ?? {};
     });
 
     // It enables to load data only once if the module is the same as the dataKey
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index a55ad67cd..3efdf1bf7 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
 
 const currentEntry = computed(() => state.get('entry'));