diff --git a/web/src/components/camera/DynamicCameraImage.tsx b/web/src/components/camera/DynamicCameraImage.tsx
index 3f84ec90d..55705b15b 100644
--- a/web/src/components/camera/DynamicCameraImage.tsx
+++ b/web/src/components/camera/DynamicCameraImage.tsx
@@ -72,7 +72,7 @@ export default function DynamicCameraImage({
       },
       loadTime > loadInterval ? 1 : loadInterval
     );
-  }, [hasActiveObjects, key]);
+  }, [key]);
 
   return (
     <AspectRatio
diff --git a/web/src/utils/historyUtil.ts b/web/src/utils/historyUtil.ts
index 94eaf2941..b91a3df11 100644
--- a/web/src/utils/historyUtil.ts
+++ b/web/src/utils/historyUtil.ts
@@ -108,7 +108,8 @@ export function getTimelineHoursForDay(
   allPreviews: Preview[],
   timestamp: number
 ): HistoryTimeline {
-  const now = new Date();
+  const endOfThisHour = new Date();
+  endOfThisHour.setHours(endOfThisHour.getHours() + 1, 0, 0, 0);
   const data: TimelinePlayback[] = [];
   const startDay = new Date(timestamp * 1000);
   startDay.setHours(23, 59, 59, 999);
@@ -143,7 +144,7 @@ export function getTimelineHoursForDay(
   for (let i = 0; i < 24; i++) {
     startDay.setHours(startDay.getHours() + 1);
 
-    if (startDay > now) {
+    if (startDay > endOfThisHour) {
       break;
     }
 
diff --git a/web/src/views/history/DesktopTimelineView.tsx b/web/src/views/history/DesktopTimelineView.tsx
index 1aadefbda..a7fd4d954 100644
--- a/web/src/views/history/DesktopTimelineView.tsx
+++ b/web/src/views/history/DesktopTimelineView.tsx
@@ -126,6 +126,11 @@ export default function DesktopTimelineView({
       return;
     }
 
+    if (timeToSeek && !scrubbing) {
+      setScrubbing(true);
+      playerRef.current?.pause();
+    }
+
     if (timeToSeek && timeToSeek != previewRef.current?.currentTime()) {
       setSeeking(true);
       previewRef.current?.currentTime(timeToSeek);
@@ -329,7 +334,7 @@ export default function DesktopTimelineView({
               <ActivityScrubber
                 items={[]}
                 timeBars={
-                  isSelected && selectedPlayback.relevantPreview
+                  isSelected
                     ? [
                         {
                           time: new Date(
@@ -351,11 +356,6 @@ export default function DesktopTimelineView({
                     return;
                   }
 
-                  if (playerRef.current?.paused() == false) {
-                    setScrubbing(true);
-                    playerRef.current?.pause();
-                  }
-
                   const seekTimestamp = data.time.getTime() / 1000;
                   const seekTime =
                     seekTimestamp - timeline.relevantPreview.start;