diff --git a/apps/x/apps/main/src/composio-handler.ts b/apps/x/apps/main/src/composio-handler.ts
index b2175819..cace8c74 100644
--- a/apps/x/apps/main/src/composio-handler.ts
+++ b/apps/x/apps/main/src/composio-handler.ts
@@ -273,8 +273,8 @@ export function listConnected(): { toolkits: string[] } {
 /**
  * Check if Composio should be used for Google services (Gmail, etc.)
  */
-export function useComposioForGoogle(): { enabled: boolean } {
-    return { enabled: composioClient.useComposioForGoogle() };
+export async function useComposioForGoogle(): Promise<{ enabled: boolean }> {
+    return { enabled: await composioClient.useComposioForGoogle() };
 }
 
 /**
diff --git a/apps/x/packages/core/src/composio/client.ts b/apps/x/packages/core/src/composio/client.ts
index 05b3918a..f1aeee7e 100644
--- a/apps/x/packages/core/src/composio/client.ts
+++ b/apps/x/packages/core/src/composio/client.ts
@@ -107,7 +107,8 @@ export async function isConfigured(): Promise<boolean> {
 /**
  * Check if Composio should be used for Google services (Gmail, etc.)
  */
-export function useComposioForGoogle(): boolean {
+export async function useComposioForGoogle(): Promise<boolean> {
+    if (await isSignedIn()) return true;
     const config = loadConfig();
     return config.use_composio_for_google === true;
 }
diff --git a/apps/x/packages/core/src/knowledge/sync_gmail.ts b/apps/x/packages/core/src/knowledge/sync_gmail.ts
index 38afc0ee..c74de77a 100644
--- a/apps/x/packages/core/src/knowledge/sync_gmail.ts
+++ b/apps/x/packages/core/src/knowledge/sync_gmail.ts
@@ -786,7 +786,7 @@ export async function init() {
     console.log("Starting Gmail Sync (TS)...");
     console.log(`Will sync every ${SYNC_INTERVAL_MS / 1000} seconds.`);
 
-    const composioMode = useComposioForGoogle();
+    const composioMode = await useComposioForGoogle();
     if (composioMode) {
         console.log('[Gmail] Using Composio backend for Gmail sync.');
     }