diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java
index f9005322..817f90a3 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java
+++ b/src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java
@@ -112,7 +112,9 @@ class PlayerAbilityDelegate implements IAbilityReceiver, IUpdatable<EntityPlayer
             cooldown = ability.getCooldownTime(player);
 
             if (player.isClientPlayer()) {
-                activateAbility(ability);
+                if (!activateAbility(ability)) {
+                    cooldown = 0;
+                }
             }
         }