diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityAIAttackSpell.java b/src/main/java/electroblob/wizardry/entity/living/EntityAIAttackSpell.java
index 21cf3471..c559a919 100644
--- a/src/main/java/electroblob/wizardry/entity/living/EntityAIAttackSpell.java
+++ b/src/main/java/electroblob/wizardry/entity/living/EntityAIAttackSpell.java
@@ -153,8 +153,8 @@ public class EntityAIAttackSpell<T extends EntityLiving & ISpellCaster> extends
 
 				// ...reset the continuous spell timer and start the cooldown.
 				this.continuousSpellTimer = 0;
+				this.cooldown = attacker.getContinuousSpell().getCooldown() + this.baseCooldown;
 				setContinuousSpellAndNotify(Spells.none, new SpellModifiers());
-				this.cooldown = this.baseCooldown;
 				return;
 
 			}else if(this.continuousSpellDuration - this.continuousSpellTimer == 1){