diff --git a/app/package.json b/app/package.json
index 5c5fdca3..9da1f713 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "sideEffects": false,
   "bin": "./dist/cli/index.js",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, React Router, Astro, Cloudflare, Bun, Node, AWS Lambda & more.",
   "homepage": "https://bknd.io",
   "repository": {
diff --git a/app/src/ui/routes/data/data.$entity.$id.tsx b/app/src/ui/routes/data/data.$entity.$id.tsx
index e0429342..ba8e989e 100644
--- a/app/src/ui/routes/data/data.$entity.$id.tsx
+++ b/app/src/ui/routes/data/data.$entity.$id.tsx
@@ -164,26 +164,36 @@ export function DataEntityUpdate({ params }) {
                ]}
             />
          </AppShell.SectionHeader>
-         <AppShell.Scrollable>
-            {error && (
-               <div className="flex flex-row dark:bg-red-950 bg-red-100 p-4">
-                  <b className="mr-2">Update failed: </b> {error}
-               </div>
-            )}
-            <EntityForm
-               entity={entity}
-               entityId={entityId}
-               handleSubmit={handleSubmit}
-               fieldsDisabled={fieldsDisabled}
-               data={data ?? undefined}
-               Form={Form}
-               action="update"
-               className="flex flex-grow flex-col gap-3 p-3"
-            />
-            {targetRelations.length > 0 ? (
-               <EntityDetailRelations id={entityId} entity={entity} relations={targetRelations} />
-            ) : null}
-         </AppShell.Scrollable>
+         {$q.isLoading ? (
+            <div className="w-full h-full flex justify-center items-center font-mono opacity-30">
+               Loading...
+            </div>
+         ) : (
+            <AppShell.Scrollable>
+               {error && (
+                  <div className="flex flex-row dark:bg-red-950 bg-red-100 p-4">
+                     <b className="mr-2">Update failed: </b> {error}
+                  </div>
+               )}
+               <EntityForm
+                  entity={entity}
+                  entityId={entityId}
+                  handleSubmit={handleSubmit}
+                  fieldsDisabled={fieldsDisabled}
+                  data={data ?? undefined}
+                  Form={Form}
+                  action="update"
+                  className="flex flex-grow flex-col gap-3 p-3"
+               />
+               {targetRelations.length > 0 ? (
+                  <EntityDetailRelations
+                     id={entityId}
+                     entity={entity}
+                     relations={targetRelations}
+                  />
+               ) : null}
+            </AppShell.Scrollable>
+         )}
       </Fragment>
    );
 }