diff --git a/frontend/src/views/Livestream.tsx b/frontend/src/views/Livestream.tsx
index 2e678e7..54a51d5 100644
--- a/frontend/src/views/Livestream.tsx
+++ b/frontend/src/views/Livestream.tsx
@@ -99,10 +99,18 @@ const LiveStreamMonitorView: React.FC = () => {
                         {mapStatusToChip(progress[k].Status)}
                       </TableCell>
                       <TableCell align='right'>
-                        {formatMicro(Number(progress[k].WaitTime))}
+                        {/* TODO: change to enum */}
+                        {progress[k].Status === 0
+                          ? formatMicro(Number(progress[k].WaitTime))
+                          : "-"
+                        }
                       </TableCell>
                       <TableCell align='right'>
-                        {new Date(progress[k].LiveDate).toLocaleString()}
+                        {/* TODO: change to enum */}
+                        {progress[k].Status === 0
+                          ? new Date(progress[k].LiveDate).toLocaleString()
+                          : "-"
+                        }
                       </TableCell>
                       <TableCell align='right'>
                         <Button variant='contained' size='small' onClick={() => stop(k)}>
diff --git a/server/internal/livestream/livestream.go b/server/internal/livestream/livestream.go
index 28472ac..f291a73 100644
--- a/server/internal/livestream/livestream.go
+++ b/server/internal/livestream/livestream.go
@@ -152,7 +152,6 @@ func (l *LiveStream) monitorStartTime(r io.Reader, doneWait chan struct{}) {
 	}
 
 	const TRIES = 5
-
 	/*
 		if it's waiting a livestream the 5th line will indicate the time to live
 		its a dumb and not robust method.