diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index da0b4cb576..3d40bfb9eb 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -88,10 +88,13 @@ function Teleporter() {
 
     this.createTargetOverlay = function() {
 
+        if (_this.targetOverlay !== null) {
+            return;
+        }
         var targetOverlayProps = {
             url: TARGET_MODEL_URL,
             dimensions: TARGET_MODEL_DIMENSIONS,
-            visible: true,
+            visible: true
         };
 
         _this.targetOverlay = Overlays.addOverlay("model", targetOverlayProps);
@@ -191,6 +194,9 @@ function Teleporter() {
     };
 
     this.deleteTargetOverlay = function() {
+        if (this.targetOverlay === null) {
+            return;
+        }
         Overlays.deleteOverlay(this.targetOverlay);
         this.intersection = null;
         this.targetOverlay = null;
@@ -616,4 +622,4 @@ function cleanup() {
     if (teleporter.updateConnected !== null) {
         Script.update.disconnect(teleporter.update);
     }
-}
\ No newline at end of file
+}