diff --git a/src/game/client/input.cpp b/src/game/client/input.cpp
index 44f1bf2..2f8e512 100644
--- a/src/game/client/input.cpp
+++ b/src/game/client/input.cpp
@@ -921,6 +921,12 @@ int CL_ButtonBits(int bResetState)
 				g_bLongJumped = true;
 			}
 		}
+		else if (!PM_GetOnGround())
+		{
+			// Do not allow long jump to trigger an additional jump while in the air
+			bits |= IN_DUCK;
+			g_bLongJumped = true;
+		}
 		else
 		{
 			if (PM_GetWaterLevel() == 2)