diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 619f450..63e93e5 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -689,7 +689,7 @@ class Tournament(models.Model):
         return self.federal_level_category != FederalLevelCategory.UNLISTED and self.hide_points_earned is False
 
     def hide_weight(self):
-        return self.federal_level_category == FederalLevelCategory.UNLISTED
+        return self.hide_teams_weight
 
     # def is_build_and_not_empty(self):
     #     return (len(self.groupstage_set.all()) > 0 or len(self.round_set.all()) > 0) and len(self.teamregistration_set.all()) >= 4
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_group_stage.html b/tournaments/templates/tournaments/broadcast/broadcasted_group_stage.html
index ec53e31..468d208 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_group_stage.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_group_stage.html
@@ -32,7 +32,9 @@
                 <div class="flex-right">
 
                     <div x-show="group_stage.teams[i-1].match_count == 0">
+                        {% if not tournament.hide_weight %}
                         <div class="score ws numbers"><span x-text="group_stage.teams[i-1].weight"></span></div>
+                        {% endif %}
                     </div>
 
                     <div x-show="group_stage.teams[i-1].match_count > 0">
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_ranking.html b/tournaments/templates/tournaments/broadcast/broadcasted_ranking.html
index f90b364..f567026 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_ranking.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_ranking.html
@@ -10,8 +10,9 @@
                     <div><span x-text="name"></div>
                 </template>
             </div>
-
+            {% if tournament.display_points_earned %}
             <div class="table-cell right horizontal-padding numbers"><span x-text="ranking.points"></div>
+            {% endif %}
         </div>
         <div x-show="index < column.length - 1">
             <hr/>
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html
index 4875ad1..0a39dcc 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html
@@ -8,9 +8,13 @@
                     </template>
                 </div>
 
+                {% if not tournament.hide_weight %}
                 <div class="table-cell center numbers"><span x-text="summon.weight"></span></div>
+                {% else %}
+                <div class="table-cell center numbers"><span x-text=""></span></div>
+                {% endif %}
                 <div class="table-cell large center"><span x-text="summon.date"></span></div>
-                <div class="table-cell"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
+                <div class="table-cell right"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
             </div>
 
             <div x-show="index < column.length - 1">