diff --git a/src/utils/socket-utils.ts b/src/utils/socket-utils.ts
index e05f150..db8fd26 100644
--- a/src/utils/socket-utils.ts
+++ b/src/utils/socket-utils.ts
@@ -43,11 +43,12 @@ function initializeSocket(
   // conversations (mirrors the X-Base44-Anonymous-Id HTTP header). Authenticated
   // clients are identified by their token instead.
   const resolvedToken = config.token ?? getAccessToken();
-  const query: Record<string, string | null | undefined> = {
+  const query: Record<string, string> = {
     app_id: config.appId,
-    token: resolvedToken,
   };
-  if (!resolvedToken) {
+  if (resolvedToken) {
+    query.token = resolvedToken;
+  } else {
     query.anonymous_id = getAnalyticsSessionId();
   }
 
diff --git a/tests/unit/socket-utils.test.ts b/tests/unit/socket-utils.test.ts
index 2d58f29..3dc9cea 100644
--- a/tests/unit/socket-utils.test.ts
+++ b/tests/unit/socket-utils.test.ts
@@ -21,7 +21,7 @@ vi.mock("socket.io-client", () => ({
 }));
 
 vi.mock("../../src/utils/auth-utils.ts", () => ({
-  getAccessToken: vi.fn(() => undefined),
+  getAccessToken: vi.fn(() => null),
 }));
 
 vi.mock("../../src/modules/analytics.ts", () => ({
@@ -61,7 +61,7 @@ describe("RoomsSocket", () => {
       const query = lastHandshakeQuery();
       expect(query.app_id).toBe("test-app-id");
       expect(query.anonymous_id).toBe("anon-session-123");
-      expect(query.token).toBeUndefined();
+      expect(query).not.toHaveProperty("token");
     });
 
     test("sends the token and no anonymous_id when authenticated", () => {