diff --git a/lib/l10n/generated/app_localizations.dart b/lib/l10n/generated/app_localizations.dart
index 2f7970d..defaa4b 100644
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -572,6 +572,12 @@ abstract class AppLocalizations {
   /// **'Matches'**
   String get matches;
 
+  /// No description provided for @member.
+  ///
+  /// In en, this message translates to:
+  /// **'Member'**
+  String get member;
+
   /// No description provided for @members.
   ///
   /// In en, this message translates to:
diff --git a/lib/l10n/generated/app_localizations_de.dart b/lib/l10n/generated/app_localizations_de.dart
index ce42807..5f2f606 100644
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -261,6 +261,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get matches => 'Spiele';
 
+  @override
+  String get member => 'Mitglied';
+
   @override
   String get members => 'Mitglieder';
 
diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart
index ea3234b..c0f9fcc 100644
--- a/lib/l10n/generated/app_localizations_en.dart
+++ b/lib/l10n/generated/app_localizations_en.dart
@@ -261,6 +261,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get matches => 'Matches';
 
+  @override
+  String get member => 'Member';
+
   @override
   String get members => 'Members';
 
diff --git a/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart
index 8799109..d960e76 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart
@@ -1,11 +1,9 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/models/match.dart';
 import 'package:tallee/data/models/player.dart';
 import 'package:tallee/data/models/team.dart';
@@ -97,23 +95,21 @@ class _CreateTeamsViewState extends State<CreateTeamsView> {
                 ),
                 const SizedBox(width: 15),
 
-                // Confirm teams and start match
+                // Confirm teams and continue with member assignment
                 MainMenuButton(
                   icon: Icons.arrow_forward_sharp,
                   onPressed: teams.length >= 2
-                      ? () async {
-                          final match = await createMatchWithTeams();
-                          if (context.mounted) {
-                            Navigator.push(
-                              context,
-                              adaptivePageRoute(
-                                builder: (context) => ManageMembersView(
-                                  match: match,
-                                  onWinnerChanged: widget.onWinnerChanged,
-                                ),
+                      ? () {
+                          final match = widget.match.copyWith(teams: teams);
+                          Navigator.push(
+                            context,
+                            adaptivePageRoute(
+                              builder: (context) => ManageMembersView(
+                                match: match,
+                                onWinnerChanged: widget.onWinnerChanged,
                               ),
-                            );
-                          }
+                            ),
+                          );
                         }
                       : null,
                 ),
@@ -202,14 +198,6 @@ class _CreateTeamsViewState extends State<CreateTeamsView> {
     }
   }
 
-  /// Saves the teams to the database and returns the updated match with the teams.
-  Future<Match> createMatchWithTeams() async {
-    final db = Provider.of<AppDatabase>(context, listen: false);
-    final match = widget.match.copyWith(teams: teams);
-    await db.matchDao.addMatch(match: match);
-    return match;
-  }
-
   @override
   void dispose() {
     for (final c in nameController) {