diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 01d5565..e1ee430 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -230,6 +230,12 @@ class Tournament(BaseModel):
     def in_progress(self):
         return self.end_date is None
 
+    def sorting_finished_date(self):
+        if self.end_date:
+            return self.end_date
+        else:
+            return self.start_date
+
     def creator(self):
         if self.event and self.event.creator:
             return self.event.creator.username
diff --git a/tournaments/views.py b/tournaments/views.py
index a408f80..f6f58a7 100644
--- a/tournaments/views.py
+++ b/tournaments/views.py
@@ -96,7 +96,7 @@ def index(request):
     finished = clean_ended_tournaments + ended_tournaments
 
     # Sort the combined list by start_date in descending order
-    finished.sort(key=lambda t: t.start_date, reverse=True)
+    finished.sort(key=lambda t: t.sorting_finished_date(), reverse=True)
 
     club = None
     if club_id: