diff --git a/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
index 8295b089d..1bee1eabe 100644
--- a/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
+++ b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
@@ -129,6 +129,11 @@ public class SafeSpotTeleport {
                 } else {
                     // Last resort
                     ((Player)entity).setGameMode(GameMode.SURVIVAL);
+                    if (Bukkit.getServer().isPrimaryThread()) {
+                        ((Player)entity).performCommand("spawn");
+                    } else {
+                        Bukkit.getScheduler().runTask(plugin, () -> ((Player)entity).performCommand("spawn"));
+                    }
                 }
             }
         }