diff --git a/src/features/online-board/components/OnlineBoardStartPage.tsx b/src/features/online-board/components/OnlineBoardStartPage.tsx
index 3e898478..dd874d39 100644
--- a/src/features/online-board/components/OnlineBoardStartPage.tsx
+++ b/src/features/online-board/components/OnlineBoardStartPage.tsx
@@ -116,8 +116,8 @@ export const OnlineBoardStartPage: FC = () => {
     if (boardSnap) {
       return {
         tab: "route",
-        departure: boardSnap.departure,
-        arrival: boardSnap.arrival,
+        ...(boardSnap.departure ? { departure: boardSnap.departure } : {}),
+        ...(boardSnap.arrival ? { arrival: boardSnap.arrival } : {}),
       };
     }
     const schedSnap = getScheduleFilter();
@@ -125,8 +125,8 @@ export const OnlineBoardStartPage: FC = () => {
       const projected = projectScheduleToBoard(schedSnap);
       return {
         tab: "route",
-        departure: projected.departure,
-        arrival: projected.arrival,
+        ...(projected.departure ? { departure: projected.departure } : {}),
+        ...(projected.arrival ? { arrival: projected.arrival } : {}),
       };
     }
     return {};
diff --git a/src/features/schedule/components/ScheduleStartPage.tsx b/src/features/schedule/components/ScheduleStartPage.tsx
index 67bb26aa..8da32ea3 100644
--- a/src/features/schedule/components/ScheduleStartPage.tsx
+++ b/src/features/schedule/components/ScheduleStartPage.tsx
@@ -110,8 +110,8 @@ export const ScheduleStartPage: FC = () => {
     const schedSnap = getScheduleFilter();
     if (schedSnap) {
       return {
-        departure: schedSnap.departure,
-        arrival: schedSnap.arrival,
+        ...(schedSnap.departure ? { departure: schedSnap.departure } : {}),
+        ...(schedSnap.arrival ? { arrival: schedSnap.arrival } : {}),
         withReturn: schedSnap.showReturn,
       };
     }
@@ -119,8 +119,8 @@ export const ScheduleStartPage: FC = () => {
     if (boardSnap) {
       const projected = projectBoardToSchedule(boardSnap);
       return {
-        departure: projected.departure,
-        arrival: projected.arrival,
+        ...(projected.departure ? { departure: projected.departure } : {}),
+        ...(projected.arrival ? { arrival: projected.arrival } : {}),
         withReturn: false,
       };
     }