diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index da0b4cb576..854e23315e 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -88,6 +88,7 @@ function Teleporter() {
 
     this.createTargetOverlay = function() {
 
+        _this.deleteTargetOverlay();
         var targetOverlayProps = {
             url: TARGET_MODEL_URL,
             dimensions: TARGET_MODEL_DIMENSIONS,
@@ -191,6 +192,9 @@ function Teleporter() {
     };
 
     this.deleteTargetOverlay = function() {
+        if (this.targetOverlay === null) {
+            return;
+        }
         Overlays.deleteOverlay(this.targetOverlay);
         this.intersection = null;
         this.targetOverlay = null;