diff --git a/game/client/prediction.cpp b/game/client/prediction.cpp
index 6646f8f9..508fc5de 100644
--- a/game/client/prediction.cpp
+++ b/game/client/prediction.cpp
@@ -903,10 +903,10 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
 
-	FinishMove( player, ucmd, g_pMoveData );
-
 	RunPostThink( player );
 
+	FinishMove( player, ucmd, g_pMoveData );
+
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
 	FinishCommand( player );
diff --git a/game/server/player_command.cpp b/game/server/player_command.cpp
index b607bbab..0b82f719 100644
--- a/game/server/player_command.cpp
+++ b/game/server/player_command.cpp
@@ -417,6 +417,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		player->pl.v_angle = ucmd->viewangles + player->pl.anglechange;
 	}
 
+	// Let server invoke any needed impact functions
+	VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
+	moveHelper->ProcessImpacts();
+	VPROF_SCOPE_END();
+
 	// Call standard client pre-think
 	RunPreThink( player );
 
@@ -442,11 +447,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 	// Copy output
 	FinishMove( player, ucmd, g_pMoveData );
 
-	// Let server invoke any needed impact functions
-	VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
-	moveHelper->ProcessImpacts();
-	VPROF_SCOPE_END();
-
 	RunPostThink( player );
 
 	g_pGameMovement->FinishTrackPredictionErrors( player );