diff --git a/src/backend/services/core.service.ts b/src/backend/services/core.service.ts
index c952399..b6d9a88 100644
--- a/src/backend/services/core.service.ts
+++ b/src/backend/services/core.service.ts
@@ -258,7 +258,10 @@ export class CoreService {
     if (!response.ok) {
       throw new Error(`Database setup failed: ${response.statusText}`);
     }
-    const data = await response.json();
-    return data.dbName;
+    const result = await response.json();
+    const dbName = result.data?.dbName || result.dbName;
+    if (!dbName) throw new Error('Database name not returned from core');
+    process.env.PLUGIN_DB_NAME = dbName;
+    return dbName;
   }
 }