diff --git a/src/p_user.cpp b/src/p_user.cpp
index f80ddb9ae..836b665d6 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -2156,9 +2156,13 @@ void P_PlayerThink (player_t *player)
 		P_DeathThink (player);
 		return;
 	}
-	if (player->jumpTics > 0)
+	if (player->jumpTics != 0)
 	{
 		player->jumpTics--;
+		if (onground && player->jumpTics < -18)
+		{
+			player->jumpTics = 0;
+		}
 	}
 	if (player->morphTics && !(player->cheats & CF_PREDICTING))
 	{