diff --git a/code/map_data.js b/code/map_data.js
index c911c35e..61c4b81d 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -251,6 +251,11 @@ window.renderPortal = function(ent) {
         removeByGuid(portalResonatorGuid(portalGuid,i));
     }
     delete window.portals[portalGuid];
+    if(window.selectedPortal === portalGuid) {
+      window.unselectOldPortal();
+      window.map.removeLayer(window.portalAccessIndicator);
+      window.portalAccessIndicator = null;
+    }
   });
   p.on('add',      function() {
     window.portals[this.options.guid] = this;