diff --git a/modules/submap.js b/modules/submap.js
index 6c1611fe..6ec6d2e9 100644
--- a/modules/submap.js
+++ b/modules/submap.js
@@ -308,7 +308,7 @@ window.Submap = (function () {
         if (options.lockMarkers) m.lock = true;
       }
     }
-    drawMarkers();
+    if (layerIsOn("toggleMarkers")) drawMarkers();
 
     stage("Redraw emblems.");
     drawEmblems();
diff --git a/modules/ui/submap.js b/modules/ui/submap.js
index 250ebd1c..a2fae5f7 100644
--- a/modules/ui/submap.js
+++ b/modules/ui/submap.js
@@ -170,7 +170,6 @@ window.UISubmap = (function () {
     oldstate = null; // destroy old state to free memory
 
     restoreLayers();
-    turnButtonOn("toggleMarkers");
     if (ThreeD.options.isOn) ThreeD.redraw();
     if ($("#worldConfigurator").is(":visible")) editWorld();
   }