diff --git a/src/editor.cpp b/src/editor.cpp
index d61a4661..6559765e 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -1148,6 +1148,7 @@ void Editor::unsetMap() {
         this->map->pruneEditHistory();
         this->map->disconnect(this);
     }
+    clearMapEvents();
     clearMapConnections();
 
     this->map = nullptr;