diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
index fde3f4f..a01eb2e 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
@@ -150,8 +150,9 @@ public class LivingEcoBoss extends PluginDependent {
             for (Effect effect : effects) {
                 effect.onDeath(boss, entity, tick);
             }
-            boss.removeLivingBoss(entity.getUniqueId());
+            boss.removeLivingBoss(uuid);
             runnable.cancel();
+            return;
         }
 
         for (BossTicker ticker : tickers) {