diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 8e74b8e..843e3f9 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -327,9 +327,9 @@ class Tournament(models.Model):
         print(f"Group stage members count: {group_stage_members_count}")
 
         if self.team_sorting == TeamSortingType.INSCRIPTION_DATE:
-            complete_teams.sort(key=lambda s: (s.date, s.initial_weight))
+            complete_teams.sort(key=lambda s: (s.date is None, s.date or datetime.min, s.initial_weight))
         else:
-            complete_teams.sort(key=lambda s: (s.initial_weight, s.date))
+            complete_teams.sort(key=lambda s: (s.initial_weight, s.date is None, s.date or datetime.min))
 
         selected_teams = complete_teams[:self.team_count]
         selected_teams.sort(key=lambda s: s.initial_weight)