diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index 164b4023..fbb00690 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -1477,6 +1477,8 @@ class EntryAdapters:
 
     @staticmethod
     async def aagent_has_entries(agent: Agent):
+        if agent is None:
+            return False
         return await Entry.objects.filter(agent=agent).aexists()
 
     @staticmethod
@@ -1495,6 +1497,8 @@ class EntryAdapters:
 
     @staticmethod
     async def aget_agent_entry_filepaths(agent: Agent):
+        if agent is None:
+            return []
         return await sync_to_async(set)(
             Entry.objects.filter(agent=agent).distinct("file_path").values_list("file_path", flat=True)
         )