diff --git a/tournaments/templates/tournaments/team_row.html b/tournaments/templates/tournaments/team_row.html
index 4205bc4..09867b8 100644
--- a/tournaments/templates/tournaments/team_row.html
+++ b/tournaments/templates/tournaments/team_row.html
@@ -5,7 +5,8 @@
             <div class="table-cell table-cell-large semibold">WC Tableau</div>
             {% elif team.wildcard_groupstage %}
             <div class="table-cell table-cell-large semibold">WC Qualifications</div>
-            {% else %}
+            {% endif %}
+            {% if team.names %}
             <div class="table-cell table-cell-large semibold">
                 {% for name in team.names %}
                 <div>{{ name }}</div>
@@ -18,6 +19,8 @@
             <div class="table-cell right horizontal-padding"></div>
             {% elif not team.wildcard_bracket and not team.wildcard_groupstage %}
             <div class="table-cell right horizontal-padding large numbers">{{ team.weight }}</div>
+            {% elif team.names %}
+            <div class="table-cell right horizontal-padding large numbers">{{ team.weight }}</div>
             {% else %}
             <div class="table-cell right horizontal-padding large numbers"></div>
             {% endif %}