diff --git a/source/game/bg_pmove.c b/source/game/bg_pmove.c
index fd53e51..93f8666 100644
--- a/source/game/bg_pmove.c
+++ b/source/game/bg_pmove.c
@@ -1126,14 +1126,6 @@ static void PM_GroundTrace( void ) {
 	pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
 	pml.groundTrace = trace;
 
-	// BFP - NOTE: Originally, BFP doesn't stop "groundtracing" when the player is flying
-#if 0
-	// BFP - If flying, do nothing when touching the ground
-	if ( pm->ps->pm_flags & PMF_FLYING ) {
-		return;
-	}
-#endif
-
 	// BFP - No ground trace handling in the water
 	if ( pm->waterlevel > 1 ) {
 		return;
@@ -1226,6 +1218,12 @@ static void PM_GroundTrace( void ) {
 		return;
 	}
 
+	// BFP - NOTE: Originally, BFP doesn't stop "groundtracing" until here when the player is flying
+	// BFP - If flying, prevent from doing a jumping action on flat ground
+	if ( pm->ps->pm_flags & PMF_FLYING ) {
+		return;
+	}
+
 	pml.groundPlane = qtrue;
 	pml.walking = qtrue;