diff --git a/mp/src/game/client/prediction.cpp b/mp/src/game/client/prediction.cpp
index 2a67007b9..751c005e1 100644
--- a/mp/src/game/client/prediction.cpp
+++ b/mp/src/game/client/prediction.cpp
@@ -909,9 +909,9 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
 
-	FinishMove( player, ucmd, g_pMoveData );
+    RunPostThink( player );
 
-	RunPostThink( player );
+	FinishMove( player, ucmd, g_pMoveData );
 
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
diff --git a/mp/src/game/server/player_command.cpp b/mp/src/game/server/player_command.cpp
index bf77b5d46..e7f8c0a3c 100644
--- a/mp/src/game/server/player_command.cpp
+++ b/mp/src/game/server/player_command.cpp
@@ -440,6 +440,8 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
 			
+    RunPostThink( player );
+
 	// Copy output
 	FinishMove( player, ucmd, g_pMoveData );
 
@@ -454,8 +456,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 	moveHelper->ProcessImpacts();
 	VPROF_SCOPE_END();
 
-	RunPostThink( player );
-
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
 	FinishCommand( player );
diff --git a/sp/src/game/client/prediction.cpp b/sp/src/game/client/prediction.cpp
index 6646f8f9e..c9fde41e8 100644
--- a/sp/src/game/client/prediction.cpp
+++ b/sp/src/game/client/prediction.cpp
@@ -903,9 +903,9 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
 
-	FinishMove( player, ucmd, g_pMoveData );
+    RunPostThink( player );
 
-	RunPostThink( player );
+	FinishMove( player, ucmd, g_pMoveData );
 
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
diff --git a/sp/src/game/server/player_command.cpp b/sp/src/game/server/player_command.cpp
index b607bbab8..ea6caf339 100644
--- a/sp/src/game/server/player_command.cpp
+++ b/sp/src/game/server/player_command.cpp
@@ -439,6 +439,8 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
 			
+    RunPostThink( player );
+
 	// Copy output
 	FinishMove( player, ucmd, g_pMoveData );
 
@@ -447,8 +449,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 	moveHelper->ProcessImpacts();
 	VPROF_SCOPE_END();
 
-	RunPostThink( player );
-
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
 	FinishCommand( player );