diff --git a/backend/app/api/v1/endpoints/providers.py b/backend/app/api/v1/endpoints/providers.py
index 3135fa7..7a9a72a 100644
--- a/backend/app/api/v1/endpoints/providers.py
+++ b/backend/app/api/v1/endpoints/providers.py
@@ -257,7 +257,7 @@ async def save_gmail_credential(
             gmail_email=credential_in.gmail_email,
             encrypted_access_token=encrypted_access,
             encrypted_refresh_token=encrypted_refresh,
-            scopes=build_gmail_credential_scopes(None, None),
+            scopes=build_gmail_credential_scopes(),
             is_valid=True,
             last_verified_at=datetime.now(timezone.utc),
         )
diff --git a/backend/app/workers/tasks.py b/backend/app/workers/tasks.py
index b78f70a..06c6715 100644
--- a/backend/app/workers/tasks.py
+++ b/backend/app/workers/tasks.py
@@ -203,11 +203,7 @@ async def process_mail_account(account_id: int):
                     if use_gmail_api and gmail_service:
                         # Inject via Gmail API (preferred)
                         label_ids = await gmail_service.build_import_label_ids(
-                            import_label_templates=(
-                                gmail_cred.import_label_templates
-                                if gmail_cred
-                                else None
-                            ),
+                            import_label_templates=gmail_cred.import_label_templates,
                             source_email=account.email_address,  # type: ignore[arg-type]
                         )
                         await gmail_service.inject_email(