diff --git a/src/camera-manager/manager.ts b/src/camera-manager/manager.ts
index 46c84256..272e23c0 100644
--- a/src/camera-manager/manager.ts
+++ b/src/camera-manager/manager.ts
@@ -267,9 +267,15 @@ export class CameraManager {
       const newChunkQuery = { ...query };
 
       if (direction === 'later') {
-        newChunkQuery.start = getTimeFromResults('latest') ?? undefined;
+        const latestResult = getTimeFromResults('latest');
+        if (latestResult) {
+          newChunkQuery.start = latestResult;
+        }
       } else if (direction === 'earlier') {
-        newChunkQuery.end = getTimeFromResults('earliest') ?? undefined;
+        const earliestResult = getTimeFromResults('earliest');
+        if (earliestResult) {
+          newChunkQuery.end = earliestResult;
+        }
       }
       newChunkQuery.limit = chunkSize;
 
diff --git a/src/components/gallery.ts b/src/components/gallery.ts
index 46c000bb..ee1432d2 100644
--- a/src/components/gallery.ts
+++ b/src/components/gallery.ts
@@ -247,7 +247,7 @@ export class FrigateCardGalleryCore extends LitElement {
     this._showExtensionLoader = false;
 
     const query = this.view?.query;
-    const rawQueries: MediaQuery[] | null = query?.getQueries() ?? null;
+    const rawQueries = query?.getQueries() ?? null;
     const existingMedia = this.view.queryResults?.getResults();
     if (!query || !rawQueries || !existingMedia) {
       return;
@@ -255,7 +255,7 @@ export class FrigateCardGalleryCore extends LitElement {
 
     let extension: ExtendedMediaQueryResult<MediaQuery> | null;
     try {
-      extension = await this.cameraManager.extendMediaQueries(
+      extension = await this.cameraManager.extendMediaQueries<MediaQuery>(
         this.hass,
         rawQueries,
         existingMedia,