diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 28736b4..6ebb4c5 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -193,11 +193,14 @@ class Tournament(models.Model):
         if waiting_list_count < 0:
             waiting_list_count = 0
 
-        waiting_teams = complete_teams[-waiting_list_count:]
-        if self.team_sorting == TeamSortingType.INSCRIPTION_DATE:
-            waiting_teams.sort(key=lambda s: (s.date, s.initial_weight))
+        if waiting_list_count > 0:
+            waiting_teams = complete_teams[-waiting_list_count:]
+            if self.team_sorting == TeamSortingType.INSCRIPTION_DATE:
+                waiting_teams.sort(key=lambda s: (s.date, s.initial_weight))
+            else:
+                waiting_teams.sort(key=lambda s: (s.initial_weight, s.date))
         else:
-            waiting_teams.sort(key=lambda s: (s.initial_weight, s.date))
+             waiting_teams = []
 
         bracket_teams.sort(key=lambda s: s.weight)
         group_stage_teams.sort(key=lambda s: s.weight)