diff --git a/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java b/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java
index 486de01b..1648d35e 100644
--- a/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java
+++ b/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java
@@ -101,6 +101,9 @@ public void onBowShot(EntityShootBowEvent event) {
       return;
     }
     int bowCooldown = plugin.getConfig().getInt("Bow.Cooldown", 5);
+    if(bowCooldown <= 0) {
+      return;
+    }
     user.setCooldown("bow_shot", bowCooldown);
     plugin.getBukkitHelper().applyActionBarCooldown(player, bowCooldown);
     VersionUtils.setMaterialCooldown(player, event.getBow().getType(), 20 * (plugin.getConfig().getInt("Bow.Cooldown", 5)));
diff --git a/src/main/java/plugily/projects/murdermystery/events/PluginEvents.java b/src/main/java/plugily/projects/murdermystery/events/PluginEvents.java
index 002ac8b3..dc7042fc 100644
--- a/src/main/java/plugily/projects/murdermystery/events/PluginEvents.java
+++ b/src/main/java/plugily/projects/murdermystery/events/PluginEvents.java
@@ -84,18 +84,18 @@ public void onSwordThrow(PlayerInteractEvent event) {
     if(attackerUser.getCooldown("sword_shoot") > 0) {
       return;
     }
+    createFlyingSword(attacker, attackerUser);
 
     int swordFlyCooldown = plugin.getConfig().getInt("Sword.Cooldown.Fly", 5);
-
+    if(swordFlyCooldown <= 0) {
+      return;
+    }
     attackerUser.setCooldown("sword_shoot", swordFlyCooldown);
-
-    if(ServerVersion.Version.isCurrentLower(ServerVersion.Version.v1_10_R1)) {
+    if(ServerVersion.Version.isCurrentLower(ServerVersion.Version.v1_11_R1)) {
       attackerUser.setCooldown("sword_attack", (plugin.getConfig().getInt("Sword.Cooldown.Attack", 1)));
     } else {
       VersionUtils.setMaterialCooldown(attacker ,plugin.getSwordSkinManager().getMurdererSword(attacker).getType(), 20 * (plugin.getConfig().getInt("Sword.Cooldown.Attack", 1)));
     }
-
-    createFlyingSword(attacker, attackerUser);
     plugin.getBukkitHelper().applyActionBarCooldown(attacker, swordFlyCooldown);
   }