diff --git a/surfsense_backend/app/routes/composio_routes.py b/surfsense_backend/app/routes/composio_routes.py
index dec9beb02..5af332760 100644
--- a/surfsense_backend/app/routes/composio_routes.py
+++ b/surfsense_backend/app/routes/composio_routes.py
@@ -14,7 +14,7 @@ Endpoints:
 import logging
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, Depends, HTTPException, Query, Request
 from fastapi.responses import RedirectResponse
 from pydantic import ValidationError
 from sqlalchemy.exc import IntegrityError
@@ -170,9 +170,8 @@ async def initiate_composio_auth(
 
 @router.get("/auth/composio/connector/callback")
 async def composio_callback(
+    request: Request,
     state: str | None = None,
-    connectedAccountId: str | None = None,  # Composio sends camelCase
-    connected_account_id: str | None = None,  # Fallback snake_case
     error: str | None = None,
     session: AsyncSession = Depends(get_async_session),
 ):
@@ -239,14 +238,16 @@ async def composio_callback(
 
         # Initialize Composio service
         service = ComposioService()
-        entity_id = f"surfsense_{user_id}"
 
-        # Use camelCase param if provided (Composio's format), fallback to snake_case
-        final_connected_account_id = connectedAccountId or connected_account_id
+        # Extract connected_account_id from query params (accepts both camelCase and snake_case)
+        query_params = request.query_params
+        final_connected_account_id = query_params.get(
+            "connectedAccountId"
+        ) or query_params.get("connected_account_id")
 
-        # DEBUG: Log all query parameters received
+        # DEBUG: Log query parameter received
         logger.info(
-            f"DEBUG: Callback received - connectedAccountId: {connectedAccountId}, connected_account_id: {connected_account_id}, using: {final_connected_account_id}"
+            f"DEBUG: Callback received - connectedAccountId: {query_params.get('connectedAccountId')}, connected_account_id: {query_params.get('connected_account_id')}, using: {final_connected_account_id}"
         )
 
         # If we still don't have a connected_account_id, warn but continue
@@ -448,7 +449,7 @@ async def list_composio_drive_folders(
         entity_id = f"surfsense_{user.id}"
 
         # Fetch files/folders from Composio Google Drive
-        files, next_token, error = await service.get_drive_files(
+        files, _next_token, error = await service.get_drive_files(
             connected_account_id=composio_connected_account_id,
             entity_id=entity_id,
             folder_id=parent_id,
@@ -502,7 +503,7 @@ async def list_composio_drive_folders(
         file_count = len(files_list)
 
         logger.info(
-            f"✅ Listed {len(items)} total items ({folder_count} folders, {file_count} files) for Composio connector {connector_id}"
+            f"Listed {len(items)} total items ({folder_count} folders, {file_count} files) for Composio connector {connector_id}"
             + (f" in folder {parent_id}" if parent_id else " in ROOT")
         )
 
diff --git a/surfsense_backend/app/routes/google_drive_add_connector_route.py b/surfsense_backend/app/routes/google_drive_add_connector_route.py
index e15aed762..6b4159d29 100644
--- a/surfsense_backend/app/routes/google_drive_add_connector_route.py
+++ b/surfsense_backend/app/routes/google_drive_add_connector_route.py
@@ -402,7 +402,7 @@ async def list_google_drive_folders(
         file_count = len(items) - folder_count
 
         logger.info(
-            f"✅ Listed {len(items)} total items ({folder_count} folders, {file_count} files) for connector {connector_id}"
+            f"Listed {len(items)} total items ({folder_count} folders, {file_count} files) for connector {connector_id}"
             + (f" in folder {parent_id}" if parent_id else " in ROOT")
         )
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index b30337de3..2923ab823 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -1182,8 +1182,11 @@ export const useConnectorDialog = () => {
 				if (!editingConnector.is_indexable) {
 					// Non-indexable connectors (like Tavily API) don't need re-indexing
 					indexingDescription = "Settings saved.";
-				} else if (editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR") {
-					// Google Drive uses folder selection from config, not date ranges
+				} else if (
+					editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" ||
+					editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR"
+				) {
+					// Google Drive (both regular and Composio) uses folder selection from config, not date ranges
 					const selectedFolders = (connectorConfig || editingConnector.config)?.selected_folders as
 						| Array<{ id: string; name: string }>
 						| undefined;
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index a3fd3ea14..4dee8888a 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -79,6 +79,9 @@ function getConnectorTypeDisplayName(connectorType: string): string {
 		GOOGLE_CALENDAR_CONNECTOR: "Google Calendar",
 		GOOGLE_GMAIL_CONNECTOR: "Gmail",
 		GOOGLE_DRIVE_CONNECTOR: "Google Drive",
+		COMPOSIO_GOOGLE_DRIVE_CONNECTOR: "Composio Google Drive",
+		COMPOSIO_GMAIL_CONNECTOR: "Composio Gmail",
+		COMPOSIO_GOOGLE_CALENDAR_CONNECTOR: "Composio Google Calendar",
 		LINEAR_CONNECTOR: "Linear",
 		NOTION_CONNECTOR: "Notion",
 		SLACK_CONNECTOR: "Slack",