diff --git a/frontend/src/components/brackets/match.tsx b/frontend/src/components/brackets/match.tsx
index baab5dbb..744552cb 100644
--- a/frontend/src/components/brackets/match.tsx
+++ b/frontend/src/components/brackets/match.tsx
@@ -55,7 +55,8 @@ export function MatchBadge({ match, theme }: { match: MatchInterface; theme: any
       >
         <Center>
           <b>
-            {match.court?.name} | <Time datetime={match.start_time} />
+            {match.court?.name} |{' '}
+            {match.start_time != null ? <Time datetime={match.start_time} /> : null}
           </b>
         </Center>
       </div>
diff --git a/frontend/src/pages/tournaments/[id]/schedule.tsx b/frontend/src/pages/tournaments/[id]/schedule.tsx
index e53c7fd8..99bba12e 100644
--- a/frontend/src/pages/tournaments/[id]/schedule.tsx
+++ b/frontend/src/pages/tournaments/[id]/schedule.tsx
@@ -59,7 +59,7 @@ function ScheduleRow({
                 </Text>
               </Group>
               <Badge color="gray" variant="dot" size="lg">
-                <Time datetime={match.start_time} />
+                {match.start_time != null ? <Time datetime={match.start_time} /> : null}
               </Badge>
             </Group>
             <Badge color={stageItemColor} variant="outline">