diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index ed1d0f492..5b7f97aca 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -409,6 +409,7 @@ void menuHandler::messageResponseMenu()
             screen->runNow();
         } else if (selected == DismissAll) {
             messageStore.clearAllMessages();
+            graphics::MessageRenderer::clearThreadRegistries();
         } else if (selected == DismissOldest) {
             messageStore.dismissOldestMessage();
         } else if (selected == Preset || selected == Freetext) {