diff --git a/code_puppy/command_line/autosave_menu.py b/code_puppy/command_line/autosave_menu.py
index b247c52f2..e35d13724 100644
--- a/code_puppy/command_line/autosave_menu.py
+++ b/code_puppy/command_line/autosave_menu.py
@@ -429,7 +429,8 @@ def display_resumed_history(
     # Use config value if num_messages not explicitly provided
     if num_messages is None:
         num_messages = get_resume_message_count()
-
+    if num_messages <= 0:
+        return
     console = Console()
     total_messages = len(history)
 
diff --git a/code_puppy/config.py b/code_puppy/config.py
index 79b5c2088..33b172770 100644
--- a/code_puppy/config.py
+++ b/code_puppy/config.py
@@ -1133,8 +1133,8 @@ def get_resume_message_count() -> int:
     val = get_value("resume_message_count")
     try:
         configured_value = int(val) if val else 50
-        # Enforce reasonable bounds: minimum 1, maximum 100
-        return max(1, min(configured_value, 100))
+        # Enforce reasonable bounds: minimum 0 (disabled), maximum 100
+        return max(0, min(configured_value, 100))
     except (ValueError, TypeError):
         return 50