diff --git a/frappe_gmail_thread/tasks/daily.py b/frappe_gmail_thread/tasks/daily.py
index 04cf712..0c7390f 100644
--- a/frappe_gmail_thread/tasks/daily.py
+++ b/frappe_gmail_thread/tasks/daily.py
@@ -14,7 +14,9 @@ def enable_pubsub_everyday():
         return
 
     gmail_accounts = frappe.get_all(
-        "Gmail Account", filters={"gmail_enabled": 1}, fields=["name"]
+        "Gmail Account",
+        filters={"gmail_enabled": 1, "refresh_token": ["is", "set"]},
+        fields=["name"],
     )
     for gmail_account in gmail_accounts:
         gaccount = frappe.get_doc("Gmail Account", gmail_account.name)
diff --git a/frappe_gmail_thread/tasks/sync.py b/frappe_gmail_thread/tasks/sync.py
index ce47c22..2e487cb 100644
--- a/frappe_gmail_thread/tasks/sync.py
+++ b/frappe_gmail_thread/tasks/sync.py
@@ -6,12 +6,11 @@ def sync_emails():
     gmail_accounts = frappe.get_all(
         "Gmail Account",
         filters={"gmail_enabled": 1},
-        fields=["name"],
+        fields=["name", "refresh_token", "linked_user"],
     )
     for gmail_account in gmail_accounts:
-        gaccount = frappe.get_doc("Gmail Account", gmail_account.name)
-        if gaccount.refresh_token:
-            user = gaccount.linked_user
+        if gmail_account.refresh_token:
+            user = gmail_account.linked_user
             job_name = f"gmail_thread_sync_{user}"
             if not is_job_enqueued(job_name):
                 frappe.enqueue(