diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
index 0c8e88dcc10a..31c54a8592bf 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
@@ -94,11 +94,15 @@ public boolean initiateRespawn(Collection<EnderCrystal> crystals) {
                 return !((CraftWorld) crystal.getWorld()).getHandle().equals(this.handle.level);
             });
 
-            this.handle.emptyCrystalRespawnAllowed = filteredCrystals.isEmpty();
-
-            return this.handle.respawnDragon(
+            boolean started = this.handle.respawnDragon(
                 Lists.transform(filteredCrystals, crystal -> ((CraftEnderCrystal) crystal).getHandle())
             );
+
+            if (started) {
+                this.handle.emptyCrystalRespawnAllowed = filteredCrystals.isEmpty();
+            }
+
+            return started;
         }
         return false;
     }