diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 867319ed..b4ec2454 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -110,12 +110,13 @@ def chat_history(
         }
     )
 
-    # Get latest N messages if N > 0
-    if n > 0 and meta_log.get("chat"):
-        meta_log["chat"] = meta_log["chat"][-n:]
-    # Else return all messages except latest N
-    elif n < 0 and meta_log.get("chat"):
-        meta_log["chat"] = meta_log["chat"][:n]
+    if n:
+        # Get latest N messages if N > 0
+        if n > 0 and meta_log.get("chat"):
+            meta_log["chat"] = meta_log["chat"][-n:]
+        # Else return all messages except latest N
+        elif n < 0 and meta_log.get("chat"):
+            meta_log["chat"] = meta_log["chat"][:n]
 
     update_telemetry_state(
         request=request,