diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
index 629707f75..5caf64eb0 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -316,10 +316,10 @@ void TabSupervisor::stop()
     }
     gameTabs.clear();
 
-    for (const auto tab : replayTabs) {
-        tabsToDelete << tab;
+    for (auto i = messageTabs.cbegin(), end = messageTabs.cend(); i != end; ++i) {
+        tabsToDelete << i.value();
     }
-    replayTabs.clear();
+    messageTabs.clear();
 
     for (const auto tab : tabsToDelete) {
         tab->closeRequest(true);