diff --git a/plugins/cross_link.user.js b/plugins/cross_link.user.js
index 8fdf49eb..86625235 100644
--- a/plugins/cross_link.user.js
+++ b/plugins/cross_link.user.js
@@ -221,6 +221,8 @@ window.plugin.crossLinks.showLink = function(link) {
 }
 
 window.plugin.crossLinks.onMapDataRefreshEnd = function () {
+    if (window.plugin.crossLinks.disabled) return;
+
     window.plugin.crossLinks.linkLayer.bringToFront();
 
     window.plugin.crossLinks.testForDeletedLinks();
@@ -270,6 +272,8 @@ window.plugin.crossLinks.createLayer = function() {
     map.on('layerremove', function(obj) {
       if(obj.layer === window.plugin.crossLinks.linkLayer) {
         window.plugin.crossLinks.disabled = true;
+        window.plugin.crossLinks.linkLayer.clearLayers();
+        plugin.crossLinks.linkLayerGuids = {};
       }
     });
 }