diff --git a/aider/models.py b/aider/models.py
index 3e61dd90b..505d71aa2 100644
--- a/aider/models.py
+++ b/aider/models.py
@@ -328,7 +328,10 @@ class Model:
         self.missing_keys = res.get("missing_keys")
         self.keys_in_environment = res.get("keys_in_environment")
 
-        if self.info.get("max_input_tokens", 0) < 32 * 1024:
+        max_input_tokens = self.info.get("max_input_tokens", 0)
+        if not max_input_tokens:
+            max_input_tokens = 0
+        if max_input_tokens < 32 * 1024:
             self.max_chat_history_tokens = 1024
         else:
             self.max_chat_history_tokens = 2 * 1024
diff --git a/aider/repomap.py b/aider/repomap.py
index 20b675549..872424b62 100644
--- a/aider/repomap.py
+++ b/aider/repomap.py
@@ -71,7 +71,7 @@ class RepoMap:
         max_map_tokens = self.max_map_tokens
 
         # With no files in the chat, give a bigger view of the entire repo
-        MUL = 16
+        MUL = 8
         padding = 4096
         if max_map_tokens and self.max_context_window:
             target = min(max_map_tokens * MUL, self.max_context_window - padding)