2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index a3032de54..e29212063 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -2166,3 +2166,9 @@ void ChatWindow::joinRoom(const bool isJoin)
         tab->setCaption(name);
     }
 }
+
+void ChatWindow::scheduleDelete()
+{
+    DebugMessageListener::removeListener(this);
+    Window::scheduleDelete();
+}
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 9664bc0ae..080e36738 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -308,6 +308,8 @@ class ChatWindow final : public Window,
 
         void debugMessage(const std::string &msg) override final;
 
+        void scheduleDelete() override final;
+
 #ifdef USE_PROFILER
         void logicChildren();
 #endif  // USE_PROFILER