diff --git a/src/mapdata.js b/src/mapdata.js
index 2efd727..021faff 100644
--- a/src/mapdata.js
+++ b/src/mapdata.js
@@ -1045,6 +1045,7 @@
     },
     clearMapData: function (preserveState) {
       var me = this;
+      me.ensureNoHighlight();
       this._clearCanvases(preserveState);
 
       // release refs to DOM elements