diff --git a/lib/data/dao/match_dao.dart b/lib/data/dao/match_dao.dart
index 3a77147..39e0990 100644
--- a/lib/data/dao/match_dao.dart
+++ b/lib/data/dao/match_dao.dart
@@ -406,7 +406,8 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       teamIds.map((teamId) => db.teamDao.getTeamById(teamId: teamId)),
     );
 
-    return teams;
+    return teams
+      ..sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
   }
 
   /* Update */
diff --git a/lib/data/dao/player_match_dao.dart b/lib/data/dao/player_match_dao.dart
index d119468..5ddc72e 100644
--- a/lib/data/dao/player_match_dao.dart
+++ b/lib/data/dao/player_match_dao.dart
@@ -74,7 +74,8 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
       (row) => db.playerDao.getPlayerById(playerId: row.playerId),
     );
     final players = await Future.wait(futures);
-    return players;
+    return players
+      ..sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
   }
 
   /// Retrieves a list of [Player]s associated with a specific team in a match.
diff --git a/lib/data/dao/team_dao.dart b/lib/data/dao/team_dao.dart
index 32e5f07..213d24e 100644
--- a/lib/data/dao/team_dao.dart
+++ b/lib/data/dao/team_dao.dart
@@ -173,7 +173,8 @@ class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
     final players = await Future.wait(
       playerIds.map((id) => db.playerDao.getPlayerById(playerId: id)),
     );
-    return players;
+    return players
+      ..sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
   }
 
   /* Update */
diff --git a/lib/presentation/views/main_menu/match_view/match_result_view.dart b/lib/presentation/views/main_menu/match_view/match_result_view.dart
index 8708bfe..d0a9ad6 100644
--- a/lib/presentation/views/main_menu/match_view/match_result_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_result_view.dart
@@ -208,7 +208,6 @@ class _MatchResultViewState extends State<MatchResultView> {
 
   void initializeAsTeamMatch() {
     allTeams = [...(widget.match.teams ?? [])];
-    allTeams.sort((a, b) => a.name.compareTo(b.name));
 
     controller = List.generate(
       allTeams.length,
@@ -508,7 +507,7 @@ class _MatchResultViewState extends State<MatchResultView> {
                     ),
                   ),
                 ),
-              if (team.members.length > 4)
+              if (team.members.length > showingPlayerAmount)
                 Container(
                   padding: const EdgeInsets.symmetric(
                     vertical: 4,