diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
index e5f4e4c..76ebd91 100644
--- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -39,6 +39,8 @@ const setupPage = async (sort_column = null, sort_direction = null) => {
     //Load Data for Edit
     item.value = JSON.stringify(await useEntities(type).selectSingle(route.params.id))
 
+    console.log(item.value)
+
   } else if (mode.value === "create") {
     //Load Data for Create
     item.value = JSON.stringify({})
@@ -65,7 +67,7 @@ setupPage()
       :platform="platform"
   />
   <EntityEdit
-      v-else-if="(mode === 'edit' || mode === 'create')"
+      v-else-if="loaded && (mode === 'edit' || mode === 'create')"
       :type="route.params.type"
       :item="item"
       :mode="mode"