diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
index 7fa8b7f1b59..8b2ebcab9e6 100644
--- a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
@@ -71,7 +71,6 @@ private void respawn(final CommandSource sender, final User teleportOwner, final
         if (spawn == null) {
             return;
         }
-        sender.sendTl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
         future.exceptionally(e -> {
             showError(sender.getSender(), e, commandLabel);
             return false;
@@ -83,8 +82,14 @@ private void respawn(final CommandSource sender, final User teleportOwner, final
         }
         if (teleportOwner == null) {
             teleportee.getAsyncTeleport().now(spawn, false, TeleportCause.COMMAND, future);
-            return;
+        } else {
+            teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
         }
-        teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
+        future.thenAccept(success -> {
+            if (success) {
+                sender.sendTl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
+            }
+        });
+
     }
 }