diff --git a/apps/api/src/lib/auth.ts b/apps/api/src/lib/auth.ts
index c8a4b78..4acf730 100644
--- a/apps/api/src/lib/auth.ts
+++ b/apps/api/src/lib/auth.ts
@@ -98,7 +98,7 @@ export const setupAuth = (c: Context) => {
             return {
               data: {
                 ...session,
-                activeOrganizationId: "test",
+                activeOrganizationId: org?.organizations?.id,
               },
             };
           },
diff --git a/apps/api/wrangler.json b/apps/api/wrangler.json
index 5509b72..aeaf77a 100644
--- a/apps/api/wrangler.json
+++ b/apps/api/wrangler.json
@@ -4,6 +4,9 @@
   "compatibility_date": "2024-12-29",
   "workers_dev": true,
   "compatibility_flags": ["nodejs_compat"],
+  "placement": {
+    "mode": "smart"
+  },
   "d1_databases": [
     {
       "binding": "DB",