diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
index e0cad8436..b7c433759 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -1161,9 +1161,10 @@ public class IslandsManager {
 
             // Set the game mode
             user.setGameMode(plugin.getIWM().getDefaultGameMode(world));
-            // Remove from mid-teleport set
-            goingHome.remove(user.getUniqueId());
+
         }
+        // Remove from mid-teleport set
+        goingHome.remove(user.getUniqueId());
     }
 
     /**