diff --git a/src/g_game.c b/src/g_game.c
index 497c54320..fed0efd34 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4117,6 +4117,7 @@ static void G_DoCompleted(void)
 	G_SetGamestate(GS_NULL);
 	wipegamestate = GS_NULL;
 
+	grandprixinfo.rank.capsules += numtargets;
 	grandprixinfo.rank.position = MAXPLAYERS;
 
 	for (i = 0; i < MAXPLAYERS; i++)
diff --git a/src/p_user.c b/src/p_user.c
index 44a8c58de..3d290a678 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1376,8 +1376,6 @@ void P_DoPlayerExit(player_t *player)
 				{
 					grandprixinfo.rank.specialWon = true;
 				}
-
-				grandprixinfo.rank.capsules += numtargets;
 			}
 		}
 	}