diff --git a/apps/webapp/app/routes/home.space._index.tsx b/apps/webapp/app/routes/home.space._index.tsx
index 747cdda..ab52477 100644
--- a/apps/webapp/app/routes/home.space._index.tsx
+++ b/apps/webapp/app/routes/home.space._index.tsx
@@ -8,7 +8,8 @@ import { requireUserId } from "~/services/session.server";
 import { useState } from "react";
 
 import { SpaceService } from "~/services/space.server";
-import { Plus } from "lucide-react";
+import { LoaderCircle, Plus } from "lucide-react";
+import { ClientOnly } from "remix-utils/client-only";
 
 export async function loader({ request }: LoaderFunctionArgs) {
   const userId = await requireUserId(request);
@@ -47,11 +48,17 @@ export default function Spaces() {
       </div>
 
       {setShowNewSpaceDialog && (
-        <NewSpaceDialog
-          open={showNewSpaceDialog}
-          onOpenChange={setShowNewSpaceDialog}
-          onSuccess={handleNewSpaceSuccess}
-        />
+        <ClientOnly
+          fallback={<LoaderCircle className="mr-2 h-4 w-4 animate-spin" />}
+        >
+          {() => (
+            <NewSpaceDialog
+              open={showNewSpaceDialog}
+              onOpenChange={setShowNewSpaceDialog}
+              onSuccess={handleNewSpaceSuccess}
+            />
+          )}
+        </ClientOnly>
       )}
     </>
   );
diff --git a/apps/webapp/app/utils/mcp/memory.ts b/apps/webapp/app/utils/mcp/memory.ts
index 304cecd..594b1a6 100644
--- a/apps/webapp/app/utils/mcp/memory.ts
+++ b/apps/webapp/app/utils/mcp/memory.ts
@@ -59,6 +59,20 @@ export const memoryTools = [
     description: "Search through ingested memory data",
     inputSchema: SearchParamsSchema,
   },
+  {
+    name: "memory_get_spaces",
+    description: "Search spaces in my memory",
+    inputSchema: {
+      type: "object",
+      properties: {
+        all: {
+          type: "boolean",
+          description: "Get all spaces",
+          default: true,
+        },
+      },
+    },
+  },
 ];
 
 // Function to call memory tools based on toolName