diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java
index 390e5d43..42f9d3de 100644
--- a/src/com/projectkorra/projectkorra/PKListener.java
+++ b/src/com/projectkorra/projectkorra/PKListener.java
@@ -380,6 +380,10 @@ public class PKListener implements Listener {
 				abil.remove();
 			}
 
+			if (CoreAbility.getAbility(player, FireJet.class) != null && event.getCause() == DamageCause.FLY_INTO_WALL) {
+				event.setCancelled(true);
+			}
+
 			if (bPlayer.isElementToggled(Element.FIRE)) {
 				return;
 			}
diff --git a/src/com/projectkorra/projectkorra/firebending/FireJet.java b/src/com/projectkorra/projectkorra/firebending/FireJet.java
index e45607f5..3f93b1e4 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireJet.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireJet.java
@@ -116,8 +116,9 @@ public class FireJet extends FireAbility {
 	@Override
 	public void remove() {
 		super.remove();
+		this.player.setGliding(false);
 		flightHandler.removeInstance(this.player, this.getName());
-		player.setGliding(false);
+		this.player.setFallDistance(0);
 	}
 
 	@Override