diff --git a/ChangeLog b/ChangeLog
index dbf7b11b0..14bff99ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
    Cory Donnelly).
  + Fixed bug that was causing the 'completed' report to sort incorrectly.
  + Fixed bug #322 which failed to propagate rc overrides to shell commands.
+ + Fixed redundant messages when exiting shell mode.
 
 ------ old releases ------------------------------
 
diff --git a/src/command.cpp b/src/command.cpp
index 2609d22a9..964d7d669 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1219,6 +1219,9 @@ void handleShell ()
     }
   }
   while (keepGoing && !std::cin.eof ());
+
+  // No need to repeat any overrides after the shell quits.
+  context.clearMessages ();
 }
 #endif