diff --git a/apps/client/src/features/viewers/backstage/Backstage.tsx b/apps/client/src/features/viewers/backstage/Backstage.tsx
index 618efc7de..d76468aec 100644
--- a/apps/client/src/features/viewers/backstage/Backstage.tsx
+++ b/apps/client/src/features/viewers/backstage/Backstage.tsx
@@ -72,6 +72,8 @@ export default function Backstage(props: BackstageProps) {
}
}
+ const totalTime = (time.duration ?? 0) + (time.addedTime ?? 0);
+
return (
@@ -87,7 +89,7 @@ export default function Backstage(props: BackstageProps) {
diff --git a/apps/client/src/features/viewers/timer/Timer.tsx b/apps/client/src/features/viewers/timer/Timer.tsx
index 7b0c43b5a..9929501d8 100644
--- a/apps/client/src/features/viewers/timer/Timer.tsx
+++ b/apps/client/src/features/viewers/timer/Timer.tsx
@@ -62,10 +62,12 @@ export default function Timer(props: TimerProps) {
const clock = formatTime(time.clock, formatOptions);
const showOverlay = pres.text !== '' && pres.visible;
const isPlaying = time.playback !== Playback.Pause;
+
const isNegative =
(time.current ?? 0) < 0 && time.timerType !== TimerType.Clock && time.timerType !== TimerType.CountUp;
-
const finished = time.playback === Playback.Play && (time.current ?? 0) < 0 && time.startedAt;
+ const totalTime = (time.duration ?? 0) + (time.addedTime ?? 0);
+
const showEndMessage = (time.current ?? 1) < 0 && viewSettings.endMessage;
const showProgress = time.playback !== Playback.Stop;
const showFinished = finished && (time.timerType !== TimerType.Clock || showEndMessage);
@@ -121,7 +123,7 @@ export default function Timer(props: TimerProps) {