diff --git a/web/src/pages/History.tsx b/web/src/pages/History.tsx
index bb42ab3cf..84680edee 100644
--- a/web/src/pages/History.tsx
+++ b/web/src/pages/History.tsx
@@ -21,6 +21,9 @@ import HistoryFilterPopover from "@/components/filter/HistoryFilterPopover";
 import useApiFilter from "@/hooks/use-api-filter";
 import HistoryCardView from "@/views/history/HistoryCardView";
 import HistoryTimelineView from "@/views/history/HistoryTimelineView";
+import { Button } from "@/components/ui/button";
+import { LuStepBack } from "react-icons/lu";
+import { IoMdArrowBack } from "react-icons/io";
 
 const API_LIMIT = 200;
 
@@ -80,7 +83,7 @@ function History() {
     { revalidateOnFocus: false }
   );
 
-  const [playback, setPlayback] = useState<Card | undefined>();
+  const [playback, setPlayback] = useState<TimelinePlayback | undefined>();
 
   const shouldAutoPlay = useMemo(() => {
     return playback == undefined && window.innerWidth < 480;
@@ -141,7 +144,16 @@ function History() {
   return (
     <>
       <div className="flex justify-between">
-        <Heading as="h2">History</Heading>
+        <div className="flex">
+          <Button
+            size="sm"
+            variant="ghost"
+            onClick={() => setPlayback(undefined)}
+          >
+            <IoMdArrowBack className="w-6 h-6" />
+          </Button>
+          <Heading as="h2">History</Heading>
+        </div>
         {!playback && (
           <HistoryFilterPopover
             filter={historyFilter}
@@ -192,10 +204,12 @@ function History() {
               setSize(size + 1);
             }}
             onDelete={onDelete}
-            onItemSelected={(card) => setPlayback(card)}
+            onItemSelected={(item) => setPlayback(item)}
           />
         )}
-        {playback != undefined && <HistoryTimelineView card={playback} isMobile={shouldAutoPlay} />}
+        {playback != undefined && (
+          <HistoryTimelineView playback={playback} isMobile={shouldAutoPlay} />
+        )}
       </>
     </>
   );
diff --git a/web/src/types/history.ts b/web/src/types/history.ts
index a6681dac9..e9b3f57c1 100644
--- a/web/src/types/history.ts
+++ b/web/src/types/history.ts
@@ -55,3 +55,9 @@ interface HistoryFilter extends FilterType {
   after: number | undefined;
   detailLevel: "normal" | "extra" | "full";
 }
+
+type TimelinePlayback = {
+  camera: string;
+  timelineItems: Timeline[];
+  relevantPreview: Preview | undefined;
+};
diff --git a/web/src/views/history/HistoryCardView.tsx b/web/src/views/history/HistoryCardView.tsx
index 9153c0ca9..bbaba938c 100644
--- a/web/src/views/history/HistoryCardView.tsx
+++ b/web/src/views/history/HistoryCardView.tsx
@@ -14,7 +14,7 @@ type HistoryCardViewProps = {
   isDone: boolean;
   onNextPage: () => void;
   onDelete: (card: Card) => void;
-  onItemSelected: (card: Card) => void;
+  onItemSelected: (item: TimelinePlayback) => void;
 };
 
 export default function HistoryCardView({
@@ -115,7 +115,17 @@ export default function HistoryCardView({
                                 shouldAutoPlay={isMobileView}
                                 relevantPreview={relevantPreview}
                                 onClick={() => {
-                                  onItemSelected(timeline);
+                                  onItemSelected({
+                                    camera: timeline.camera,
+                                    timelineItems: Object.values(
+                                      timelineHour
+                                    ).flatMap((card) =>
+                                      card.camera == timeline.camera
+                                        ? card.entries
+                                        : []
+                                    ),
+                                    relevantPreview: relevantPreview,
+                                  });
                                 }}
                                 onDelete={() => onDelete(timeline)}
                               />
diff --git a/web/src/views/history/HistoryTimelineView.tsx b/web/src/views/history/HistoryTimelineView.tsx
index ffbf09494..2d2fe7a79 100644
--- a/web/src/views/history/HistoryTimelineView.tsx
+++ b/web/src/views/history/HistoryTimelineView.tsx
@@ -1,21 +1,18 @@
 import { useApiHost } from "@/api";
 import VideoPlayer from "@/components/player/VideoPlayer";
 import ActivityScrubber from "@/components/scrubber/ActivityScrubber";
-import {
-  getTimelineIcon,
-  getTimelineItemDescription,
-} from "@/utils/timelineUtil";
+import { Button } from "@/components/ui/button";
+import { getTimelineItemDescription } from "@/utils/timelineUtil";
 import { useMemo, useRef, useState } from "react";
-import { LuDog } from "react-icons/lu";
 import Player from "video.js/dist/types/player";
 
 type HistoryTimelineViewProps = {
-  card: Card;
+  playback: TimelinePlayback;
   isMobile: boolean;
 };
 
 export default function HistoryTimelineView({
-  card,
+  playback,
   isMobile,
 }: HistoryTimelineViewProps) {
   const apiHost = useApiHost();
@@ -23,13 +20,14 @@ export default function HistoryTimelineView({
   const previewRef = useRef<Player | undefined>(undefined);
 
   const [scrubbing, setScrubbing] = useState(false);
-  const relevantPreview = {
-    src: "http://localhost:5173/clips/previews/side_cam/1703174400.071426-1703178000.011979.mp4",
-    start: 1703174400.071426,
-    end: 1703178000.011979,
-  };
 
-  const timelineTime = useMemo(() => card.entries.at(0)!!.timestamp, [card]);
+  const timelineTime = useMemo(() => {
+    if (!playback) {
+      return 0;
+    }
+
+    return playback.timelineItems.at(0)!!.timestamp;
+  }, [playback]);
   const playbackTimes = useMemo(() => {
     const date = new Date(timelineTime * 1000);
     date.setMinutes(0, 0, 0);
@@ -40,12 +38,12 @@ export default function HistoryTimelineView({
   }, [timelineTime]);
 
   const playbackUri = useMemo(() => {
-    if (!card) {
+    if (!playback) {
       return "";
     }
 
-    return `${apiHost}vod/${card?.camera}/start/${playbackTimes.start}/end/${playbackTimes.end}/master.m3u8`;
-  }, [card, playbackTimes]);
+    return `${apiHost}vod/${playback.camera}/start/${playbackTimes.start}/end/${playbackTimes.end}/master.m3u8`;
+  }, [playback, playbackTimes]);
 
   return (
     <>
@@ -92,7 +90,7 @@ export default function HistoryTimelineView({
                 loadingSpinner: false,
                 sources: [
                   {
-                    src: `${relevantPreview.src}`,
+                    src: `${playback.relevantPreview!!.src}`,
                     type: "video/mp4",
                   },
                 ],
@@ -107,7 +105,7 @@ export default function HistoryTimelineView({
             />
           </div>
           <ActivityScrubber
-            items={timelineItemsToScrubber(card.entries)}
+            items={timelineItemsToScrubber(playback.timelineItems)}
             timeBars={[{ time: new Date(timelineTime * 1000), id: "playback" }]}
             options={{
               min: new Date(parseInt(playbackTimes.start) * 1000),
@@ -122,7 +120,7 @@ export default function HistoryTimelineView({
 
               const seekTimestamp = data.time.getTime() / 1000;
               previewRef.current?.currentTime(
-                seekTimestamp - relevantPreview.start
+                seekTimestamp - playback.relevantPreview!!.start
               );
             }}
             timechangedHandler={(data) => {