diff --git a/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart b/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
index c30d6ef..93686bd 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
@@ -74,10 +74,18 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
           Expanded(
             child: Visibility(
               visible: filteredGroups.isNotEmpty,
-              replacement: const TopCenteredMessage(
-                icon: Icons.info,
-                title: 'Info',
-                message: 'There is no group matching your search',
+              replacement: Visibility(
+                visible: controller.text.isNotEmpty,
+                replacement: const TopCenteredMessage(
+                  icon: Icons.info,
+                  title: 'Info',
+                  message: 'You have no groups created yet',
+                ),
+                child: const TopCenteredMessage(
+                  icon: Icons.info,
+                  title: 'Info',
+                  message: 'There is no group matching your search',
+                ),
               ),
               child: ListView.builder(
                 padding: const EdgeInsets.only(bottom: 85),