diff --git a/src/emacs.c b/src/emacs.c
index 4953220f110177eeb53dd0c05344997c74cd11db..34ab179dfde36c57e67cfd4d766ede619154bccd 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1737,6 +1737,7 @@ shut_down_emacs (sig, no_x, stuff)
 #endif
 
   check_glyph_memory ();
+  check_message_stack ();
 
 #ifdef MSDOS
   dos_cleanup ();