diff --git a/src/features/tournaments/components/group-match-card.tsx b/src/features/tournaments/components/group-match-card.tsx
index 1b202a3..75f25e8 100644
--- a/src/features/tournaments/components/group-match-card.tsx
+++ b/src/features/tournaments/components/group-match-card.tsx
@@ -93,7 +93,7 @@ const GroupMatchCard: React.FC<GroupMatchCardProps> = ({ match, showControls })
             <Stack gap="sm">
               <Group justify="space-between" align="center" wrap="nowrap">
                 <Group gap="sm" style={{ flex: 1, minWidth: 0 }}>
-                  <TeamAvatar team={match.home} size={32} radius="sm" isRegional={match.tournament.regional} />
+                  {match.home && <TeamAvatar team={match.home} size={32} radius="sm" isRegional={match.tournament.regional} />}
                   <Text
                     size="sm"
                     fw={homeWon ? 700 : 500}
@@ -124,7 +124,7 @@ const GroupMatchCard: React.FC<GroupMatchCardProps> = ({ match, showControls })
 
               <Group justify="space-between" align="center" wrap="nowrap">
                 <Group gap="sm" style={{ flex: 1, minWidth: 0 }}>
-                  <TeamAvatar team={match.away} size={32} radius="sm" isRegional={match.tournament.regional} />
+                  {match.away && <TeamAvatar team={match.away} size={32} radius="sm" isRegional={match.tournament.regional} />}
                   <Text
                     size="sm"
                     fw={awayWon ? 700 : 500}
@@ -190,7 +190,7 @@ const GroupMatchCard: React.FC<GroupMatchCardProps> = ({ match, showControls })
           <MatchForm
             match={match}
             onSubmit={handleFormSubmit}
-            isPending={end.isPending}
+            onCancel={editSheet.close}
           />
         </Sheet>
       )}
diff --git a/src/features/tournaments/utils/group-config.ts b/src/features/tournaments/utils/group-config.ts
index 0b02e82..4aa1582 100644
--- a/src/features/tournaments/utils/group-config.ts
+++ b/src/features/tournaments/utils/group-config.ts
@@ -116,7 +116,7 @@ function generateDescription(config: Partial<GroupConfigOption>): string {
 
   let desc = '';
 
-  if (groups_with_extra && groups_with_extra > 0) {
+  if (groups_with_extra && groups_with_extra > 0 && teams_per_group) {
     const largerGroupSize = teams_per_group + 1;
     const smallerGroupCount = num_groups! - groups_with_extra;