diff --git a/src/com/projectkorra/projectkorra/firebending/FireJet.java b/src/com/projectkorra/projectkorra/firebending/FireJet.java
index cbf14d4d..101e25ad 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireJet.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireJet.java
@@ -56,7 +56,6 @@ public class FireJet extends CoreAbility {
 			// timers.put(player, time);
 			//instances.put(player, this);
 			putInstance(player, this);
-			GeneralMethods.invincible.add(this);
 			bPlayer.addCooldown("FireJet", config.get().getLong("Abilities.Fire.FireJet.Cooldown"));
 		}
 
@@ -132,6 +131,12 @@ public class FireJet extends CoreAbility {
 		defaultduration = config.get().getLong("Abilities.Fire.FireJet.Duration");
 		isToggle = config.get().getBoolean("Abilities.Fire.FireJet.IsAvatarStateToggle");
 	}
+	
+	@Override
+	public void remove() {
+		super.remove();
+		GeneralMethods.invincible.remove(this);
+	}
 
 	public void setDuration(long duration) {
 		this.duration = duration;