diff --git a/src/components/admin/pages/event/FightList.svelte b/src/components/admin/pages/event/FightList.svelte
index 3cfc3e4..63d38be 100644
--- a/src/components/admin/pages/event/FightList.svelte
+++ b/src/components/admin/pages/event/FightList.svelte
@@ -155,7 +155,7 @@
 
     $: minTime = dayjs(Math.min(...fights.map(fight => fight.start))).utc(true);
     let changeTimeOpen = false;
-    let changedTime = dayjs(Math.min(...fights.map(fight => fight.start), 0))?.utc(true).toISOString()?.slice(0, -1);
+    let changedTime = fights.length != 0 ? dayjs(Math.min(...fights.map(fight => fight.start)))?.utc(true)?.toISOString()?.slice(0, -1) : undefined;
 
     $: deltaTime = dayjs.duration(dayjs(changedTime).utc(true).diff(minTime))
 
@@ -194,7 +194,7 @@
                 <CalendarWeekOutline/>
             </ToolbarButton>
             <Tooltip>Reschedule Fights</Tooltip>
-            <ToolbarButton on:click={() => selectedFights.size > 0 ? kampfleiterOpen = true : kampfleiterOpen = false}>
+            <ToolbarButton on:click={() => selectedFights.size > 0 ? kampfleiterOpen = true : kampfleiterOpen = false} disabled={changedTime === undefined}>
                 <ProfileCardOutline/>
             </ToolbarButton>
             <Tooltip>Change Kampfleiter</Tooltip>