diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java
index 9cbe83c6..d315d6d0 100644
--- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java
+++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java
@@ -34,9 +34,14 @@ public class RoomUnitTeleport implements Runnable {
 
     @Override
     public void run() {
-        if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null || roomUnit.isLeavingTeleporter)
+        if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null)
             return;
 
+        if (roomUnit.isLeavingTeleporter) {
+            roomUnit.isWiredTeleporting = false;
+            return;
+        }
+
         RoomTile lastLocation = this.roomUnit.getCurrentLocation();
         RoomTile newLocation = this.room.getLayout().getTile((short) this.x, (short) this.y);