diff --git a/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx b/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx
index ee04c66e0..b414f316b 100644
--- a/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx
+++ b/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx
@@ -122,10 +122,11 @@ export default function MinimalTimer(props: MinimalTimerProps) {
 
   const isPlaying = time.playback !== Playback.Pause;
 
-  const shouldShowModifiers = time.timerType !== TimerType.Clock && time.timerType !== TimerType.CountUp;
+  const shouldShowModifiers = time.timerType === TimerType.CountDown || time.timerType === TimerType.TimeToEnd;
   const finished = time.phase === TimerPhase.Overtime;
-  const showEndMessage = finished && viewSettings.endMessage && !hideEndMessage;
-  const showFinished = finished && !userOptions?.hideOvertime && (shouldShowModifiers || showEndMessage);
+  const showEndMessage = shouldShowModifiers && finished && viewSettings.endMessage && !hideEndMessage;
+  const showFinished =
+    shouldShowModifiers && finished && !userOptions?.hideOvertime && (shouldShowModifiers || showEndMessage);
 
   const showProgress = time.playback !== Playback.Stop;
   const showWarning = shouldShowModifiers && time.phase === TimerPhase.Warning;
diff --git a/apps/client/src/features/viewers/timer/Timer.tsx b/apps/client/src/features/viewers/timer/Timer.tsx
index dd448e648..27530fe5f 100644
--- a/apps/client/src/features/viewers/timer/Timer.tsx
+++ b/apps/client/src/features/viewers/timer/Timer.tsx
@@ -114,10 +114,10 @@ export default function Timer(props: TimerProps) {
   const finished = time.phase === TimerPhase.Overtime;
   const totalTime = (time.duration ?? 0) + (time.addedTime ?? 0);
 
-  const shouldShowModifiers = time.timerType !== TimerType.Clock && time.timerType !== TimerType.CountUp;
-  const showEndMessage = finished && viewSettings.endMessage;
+  const shouldShowModifiers = time.timerType === TimerType.CountDown || time.timerType === TimerType.TimeToEnd;
+  const showEndMessage = shouldShowModifiers && finished && viewSettings.endMessage;
   const showProgress = time.playback !== Playback.Stop;
-  const showFinished = finished && (shouldShowModifiers || showEndMessage);
+  const showFinished = shouldShowModifiers && finished && (shouldShowModifiers || showEndMessage);
   const showWarning = shouldShowModifiers && time.phase === TimerPhase.Warning;
   const showDanger = shouldShowModifiers && time.phase === TimerPhase.Danger;
   const showClock = time.timerType !== TimerType.Clock;