diff --git a/server/configApi.js b/server/configApi.js
index 4854e541f..3f17ee5c6 100644
--- a/server/configApi.js
+++ b/server/configApi.js
@@ -100,7 +100,7 @@ class ConfigApi {
             const { apiClients, pbsApiClients } = await initializeApiClients(testEndpoints, testPbsConfigs);
             
             // Try a simple API call to verify connection
-            const testClient = apiClients.get('test-primary');
+            const testClient = apiClients['test-primary'];
             if (testClient) {
                 await testClient.client.get('/nodes');
             }
diff --git a/server/index.js b/server/index.js
index 28024bd11..6573ddb9b 100644
--- a/server/index.js
+++ b/server/index.js
@@ -978,8 +978,8 @@ async function startServer() {
     } else {
         console.log("INFO: No endpoints configured. Starting in setup mode.");
         // Initialize empty clients for consistency
-        apiClients = new Map();
-        pbsApiClients = new Map();
+        apiClients = {};
+        pbsApiClients = {};
         global.pulseApiClients = { apiClients, pbsApiClients };
     }