diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 6d29a8bb99717807d470d61f8069a82c97ce5757..0b970850d7d7cd1092d856b6e5cea0a741b202f8 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -590,6 +590,12 @@ public class Player extends CreeperEntity {
                     if (!getCurrentRoom().getRoomId().equals(originalRoom.getRoomId())) {
                         return;
                     }
+                    if (!npc.getIsAlive().get()) {
+                        return;
+                    }
+                    if (isActive(CoolDownType.DEATH)) {
+                        return;
+                    }
                     gameManager.writeToPlayerCurrentRoom(getPlayerId(), getPlayerName() + " has " + Color.BOLD_ON + Color.RED + "ANGERED" + Color.RESET + " a " + npc.getColorName() + "\r\n");
                     addActiveFight(npc);
                 }, 5, TimeUnit.SECONDS);