diff --git a/apps/web/src/components/spaces-grid.tsx b/apps/web/src/components/spaces-grid.tsx
index 80adf05..4524eee 100644
--- a/apps/web/src/components/spaces-grid.tsx
+++ b/apps/web/src/components/spaces-grid.tsx
@@ -147,79 +147,80 @@ export function SpacesGrid() {
 
       {/* Spaces Grid */}
       <div className="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
-        {filteredSpaces.map((space) => (
-          <Card
-            className="group cursor-pointer border-border/50 transition-all duration-200 hover:border-border hover:shadow-lg"
-            key={space.id}
-            onClick={() => {
-              window.location.href = `/space?id=${space.id}`;
-            }}
-          >
-            <CardHeader className="pb-3">
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-2">
-                  <div
-                    className="h-3 w-3 rounded-full"
-                    style={{ backgroundColor: space.color }}
-                  />
-                  <h3 className="font-semibold text-foreground transition-colors group-hover:text-primary">
-                    {space.name}
-                  </h3>
+        {filteredSpaces.map((space) => {
+          const snapshot = space.snapshotText
+            ? JSON.parse(space.snapshotText).document
+            : undefined;
+          return (
+            <Card
+              className="group cursor-pointer border-border/50 transition-all duration-200 hover:border-border hover:shadow-lg"
+              key={space.id}
+              onClick={() => {
+                window.location.href = `/space?id=${space.id}`;
+              }}
+            >
+              <CardHeader className="pb-3">
+                <div className="flex items-center justify-between">
+                  <div className="flex items-center gap-2">
+                    <div
+                      className="h-3 w-3 rounded-full"
+                      style={{ backgroundColor: space.color }}
+                    />
+                    <h3 className="font-semibold text-foreground transition-colors group-hover:text-primary">
+                      {space.name}
+                    </h3>
+                  </div>
+                  <Button
+                    className="h-8 w-8 p-0 opacity-0 transition-opacity group-hover:opacity-100"
+                    size="sm"
+                    variant="ghost"
+                  >
+                    <MoreHorizontal className="h-4 w-4" />
+                  </Button>
                 </div>
-                <Button
-                  className="h-8 w-8 p-0 opacity-0 transition-opacity group-hover:opacity-100"
-                  size="sm"
-                  variant="ghost"
-                >
-                  <MoreHorizontal className="h-4 w-4" />
-                </Button>
-              </div>
-            </CardHeader>
+              </CardHeader>
 
-            <CardContent className="pb-3">
-              <div className="relative inset-0 min-h-52 min-w-64 overflow-hidden rounded-lg border border-border/30 bg-muted/30">
-                <Tldraw
-                  cameraOptions={{
-                    constraints: {
-                      initialZoom: "fit-min",
-                      bounds: {
-                        x: 0,
-                        y: 0,
-                        w: 9000,
-                        h: 9000,
+              <CardContent className="pb-3">
+                <div className="relative inset-0 min-h-52 min-w-64 overflow-hidden rounded-lg border border-border/30 bg-muted/30">
+                  <Tldraw
+                    cameraOptions={{
+                      constraints: {
+                        initialZoom: "fit-min",
+                        bounds: {
+                          x: 0,
+                          y: 0,
+                          w: 9000,
+                          h: 9000,
+                        },
+                        baseZoom: "fit-min",
+                        behavior: "fixed",
+                        origin: {
+                          x: 0,
+                          y: 0,
+                        },
+                        padding: {
+                          x: 0.1,
+                          y: 0.1,
+                        },
                       },
-                      baseZoom: "fit-min",
-                      behavior: "fixed",
-                      origin: {
-                        x: 0,
-                        y: 0,
-                      },
-                      padding: {
-                        x: 0.1,
-                        y: 0.1,
-                      },
-                    },
-                  }}
-                  className="min-h-52"
-                  hideUi
-                  onMount={(editor) => {
-                    editor.updateInstanceState({ isReadonly: true });
-                  }}
-                  snapshot={
-                    space.snapshotText
-                      ? JSON.parse(space.snapshotText).document
-                      : undefined
-                  }
-                />
-              </div>
-            </CardContent>
+                    }}
+                    className="min-h-52"
+                    hideUi
+                    onMount={(editor) => {
+                      editor.updateInstanceState({ isReadonly: true });
+                    }}
+                    snapshot={snapshot}
+                  />
+                </div>
+              </CardContent>
 
-            <CardFooter className="flex items-center justify-between pt-0 text-muted-foreground text-sm">
-              <span>{space.itemCount} items</span>
-              <span>Edited {space.lastEdited}</span>
-            </CardFooter>
-          </Card>
-        ))}
+              <CardFooter className="flex items-center justify-between pt-0 text-muted-foreground text-sm">
+                <span>{snapshot?.itemCount} items</span>
+                <span>Edited {space.lastEdited}</span>
+              </CardFooter>
+            </Card>
+          );
+        })}
       </div>
 
       {/* Empty State (when no spaces exist) */}
diff --git a/apps/web/src/lib/appwrite-db.ts b/apps/web/src/lib/appwrite-db.ts
index 9920db0..60b1c74 100644
--- a/apps/web/src/lib/appwrite-db.ts
+++ b/apps/web/src/lib/appwrite-db.ts
@@ -100,6 +100,8 @@ export async function upsertSpaceSnapshot(
     spaceId,
     userId: uid,
     snapshot: JSON.stringify(payload),
+    title: existing?.title,
+    color: existing?.color,
   } as const;
 
   if (existing) {
diff --git a/apps/web/src/routes/space.tsx b/apps/web/src/routes/space.tsx
index a8b1f81..f219256 100644
--- a/apps/web/src/routes/space.tsx
+++ b/apps/web/src/routes/space.tsx
@@ -9,6 +9,7 @@ import {
 } from "tldraw";
 import { z } from "zod";
 import "tldraw/tldraw.css";
+import Loader from "@/components/loader";
 import {
   getLatestSpaceSnapshot,
   type RemoteSnapshot,
@@ -78,6 +79,10 @@ function SpaceRoute() {
     };
   }, [id, session, store]);
 
+  if (!(id && session)) {
+    return <Loader />;
+  }
+
   return (
     <div className="mx-4 mt-4" style={{ position: "relative", inset: 0 }}>
       <Tldraw