diff --git a/src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerEnterCombatEvent.java b/src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerEnterCombatEvent.java
index ee9e93a..cc13c96 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerEnterCombatEvent.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerEnterCombatEvent.java
@@ -45,4 +45,9 @@ public class PlayerEnterCombatEvent extends Event implements Cancellable {
     public HandlerList getHandlers() {
         return HANDLERS;
     }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
 }
diff --git a/src/main/java/me/youhavetrouble/preventstabby/util/CombatTimer.java b/src/main/java/me/youhavetrouble/preventstabby/util/CombatTimer.java
index ce1eba5..062b1fd 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/util/CombatTimer.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/util/CombatTimer.java
@@ -17,8 +17,11 @@ public class CombatTimer {
             if (player == null || !player.isOnline()) return;
             PlayerEnterCombatEvent playerEnterCombatEvent = new PlayerEnterCombatEvent(player);
             Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
-                Bukkit.getPluginManager().callEvent(playerEnterCombatEvent);
-                if (playerEnterCombatEvent.isCancelled()) return;
+                if (PlayerEnterCombatEvent.getHandlerList().getRegisteredListeners().length > 0) {
+                    Bukkit.getPluginManager().callEvent(playerEnterCombatEvent);
+                    if (playerEnterCombatEvent.isCancelled()) return;
+                }
+
                 PreventStabby.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
 
                 if (combattime <= 0) {