diff --git a/participation/templates/participation/tournament_detail.html b/participation/templates/participation/tournament_detail.html
index 0fc8535..e889bc2 100644
--- a/participation/templates/participation/tournament_detail.html
+++ b/participation/templates/participation/tournament_detail.html
@@ -106,7 +106,7 @@
                         <li>
                             <strong>{{ participation.team }} :</strong> {{ note|floatformat }}
                             {% if participation.final %}
-                                <span class="badge badge-sm bg-warning">
+                                <span class="badge badge-sm text-bg-warning">
                                     <i class="fas fa-medal"></i>
                                     {% trans "Selected for final tournament" %}
                                 </span>
@@ -114,7 +114,7 @@
                             {% if user.registration.is_admin or user.registration in tournament.organizers.all %}
                                 {% if team_selectable_for_final == participation %}
                                     <a href="{% url 'participation:select_team_final' pk=tournament.pk participation_id=participation.pk %}"
-                                       class="badge badge-sm bg-success">
+                                       class="badge badge-sm text-bg-success">
                                         <i class="fas fa-medal"></i>
                                         {% trans "Select for final tournament" %}
                                     </a>
diff --git a/participation/views.py b/participation/views.py
index cdbe1c4..db3b595 100644
--- a/participation/views.py
+++ b/participation/views.py
@@ -621,7 +621,8 @@ class TournamentDetailView(MultiTableMixin, DetailView):
         context["available_notes_1"] = all(pool.results_available for pool in self.object.pools.filter(round=1).all())
         context["available_notes_2"] = all(pool.results_available for pool in self.object.pools.filter(round=2).all())
 
-        if not self.object.final and notes and self.request.user.registration.is_volunteer:
+        if not self.object.final and notes and context["available_notes_2"] \
+                and self.request.user.registration.is_volunteer:
             context["team_selectable_for_final"] = next(participation for participation, _note in sorted_notes
                                                         if not participation.final)