diff --git a/aider/commands.py b/aider/commands.py
index 29f4bc63b..a4541c58d 100644
--- a/aider/commands.py
+++ b/aider/commands.py
@@ -336,6 +336,10 @@ class Commands:
             else:
                 other_files.append(file)
 
+        if not chat_files and not other_files:
+            self.io.tool_output("\nNo files in chat or git repo.")
+            return
+
         if chat_files:
             self.io.tool_output("Files in chat:\n")
         for file in chat_files: