diff --git a/webapp/src/Service/ScoreboardService.php b/webapp/src/Service/ScoreboardService.php
index 0c1167d425..514df61299 100644
--- a/webapp/src/Service/ScoreboardService.php
+++ b/webapp/src/Service/ScoreboardService.php
@@ -779,6 +779,8 @@ public function getGroupedAffiliations(Contest $contest): array
                     $affiliations[$teamaffil->getName()] = [
                         'id'   => $teamaffil->getExternalid(),
                         'name' => $teamaffil->getName(),
+                        'country' => $teamaffil->getCountry(),
+                        'color' => $category->getColor(),
                     ];
                 }
             }
diff --git a/webapp/templates/partials/scoreboard.html.twig b/webapp/templates/partials/scoreboard.html.twig
index 4fb8a18bfb..79de781183 100644
--- a/webapp/templates/partials/scoreboard.html.twig
+++ b/webapp/templates/partials/scoreboard.html.twig
@@ -67,7 +67,16 @@
                             <div class="card-body">
                                 <ul class="list-group list-group-flush">
                                     {% for affiliation in affiliations %}
-                                        <li class="list-group-item">
+                                        {% if affiliation.color is null %}
+                                            {% set color = "#FFFFFF" %}
+                                            {% set colorClass = "_FFFFFF" %}
+                                        {% else %}
+                                            {% set colorClass = affiliation.color | replace({"#": "_"}) %}
+                                        {% endif %}
+                                        <li class="list-group-item cl{{ colorClass }}">
+                                            {% if showFlags %}
+                                                {{ affiliation.country|countryFlag }}
+                                            {% endif %}
                                             {% set affiliationLogo = affiliation.id | assetPath('affiliation') %}
                                             {% if affiliationLogo %}
                                                 <img loading="lazy" class="affiliation-logo"