diff --git a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
index ca4e14a94..970026219 100644
--- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
@@ -24,16 +24,6 @@ public class Archery {
     public static final int DAZE_MAX_BONUS_LEVEL = 1000;
     public static final int DAZE_MODIFIER = 4;
 
-    protected static boolean arrowTrackerContains(LivingEntity livingEntity) {
-        for (TrackedEntity trackedEntity : trackedEntities) {
-            if (trackedEntity.getLivingEntity() == livingEntity) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     protected static void incrementTrackerValue(LivingEntity livingEntity) {
         for (TrackedEntity trackedEntity : trackedEntities) {
             if (trackedEntity.getLivingEntity() == livingEntity) {
@@ -41,6 +31,9 @@ public class Archery {
                 return;
             }
         }
+
+        //If the entity isn't tracked yet
+        addToTracker(livingEntity);
     }
 
     protected static void addToTracker(LivingEntity livingEntity) {
diff --git a/src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java b/src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java
index 7d7aa4458..1b3bd7892 100644
--- a/src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java
@@ -22,11 +22,6 @@ public class ArrowTrackingEventHandler {
     }
 
     protected void addToTracker() {
-        if (Archery.arrowTrackerContains(entity)) {
-            Archery.incrementTrackerValue(entity);
-        }
-        else {
-            Archery.addToTracker(entity);
-        }
+        Archery.incrementTrackerValue(entity);
     }
 }