diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
index 3fe6700c..4cf19cc3 100644
--- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
+++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
@@ -151,7 +151,7 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
             }
         }
         
-        if (data.thornsId == damaged.getEntityId() && damage <= 4 && tick == data.damageTakenByEntityTick){
+        if (damage <= 4 && tick == data.damageTakenByEntityTick && data.thornsId != Integer.MIN_VALUE && data.thornsId == damaged.getEntityId()){
         	// Don't handle further, but do respect selfhit/canceldead.
         	data.thornsId = Integer.MIN_VALUE;
         	System.out.println("*** SKIP THORNS: " + player.getName());