diff --git a/src/modes/free_for_all.cpp b/src/modes/free_for_all.cpp
index ec3e010f4..a252016e7 100644
--- a/src/modes/free_for_all.cpp
+++ b/src/modes/free_for_all.cpp
@@ -210,7 +210,15 @@ void FreeForAll::getKartsDisplayInfo(
         rank_info.lap = -1;
         rank_info.m_outlined_font = true;
         rank_info.m_color = getColor(i);
-        rank_info.m_text = getKart(i)->getController()->getName() + L" (" +
+        rank_info.m_text = getKart(i)->getController()->getName();
+        const core::stringw& flag = StringUtils::getCountryFlag(
+            race_manager->getKartInfo(i).getCountryCode());
+        if (!flag.empty())
+        {
+            rank_info.m_text += L" ";
+            rank_info.m_text += flag;
+        }
+        rank_info.m_text += core::stringw(L" (") +
             StringUtils::toWString(m_scores[i]) + L")";
     }
 }   // getKartsDisplayInfo
diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index 1d8ea8d93..51474b023 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -640,6 +640,13 @@ void LinearWorld::getKartsDisplayInfo(
         else if (kart->hasFinishedRace())
         {
             rank_info.m_text = kart->getController()->getName();
+            const core::stringw& flag = StringUtils::getCountryFlag(
+                race_manager->getKartInfo(i).getCountryCode());
+            if (!flag.empty())
+            {
+                rank_info.m_text += L" ";
+                rank_info.m_text += flag;
+            }
         }
         else
         {