diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index f081b20fc..5817aca09 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -1229,8 +1229,14 @@ void RaceResultGUI::unload()
         }
 
         // Display highscores
-        if (RaceManager::get()->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX ||
-            m_animation_state == RR_RACE_RESULT)
+        if (RaceManager::get()->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
+        {
+            // After determineGPLayout the GP ranking in race manager is correct
+            if (m_animation_state >= RR_OLD_GP_RESULTS &&
+                m_animation_state <= RR_WAIT_TILL_END)
+                displayPostRaceInfo();
+        }
+        else if (m_animation_state >= RR_RACE_RESULT)
         {
             displayPostRaceInfo();
         }