diff --git a/src/utils/embla/plugins/auto-size/auto-size.ts b/src/utils/embla/plugins/auto-size/auto-size.ts
index bfadef33..ee226555 100644
--- a/src/utils/embla/plugins/auto-size/auto-size.ts
+++ b/src/utils/embla/plugins/auto-size/auto-size.ts
@@ -1,6 +1,7 @@
 import { EmblaCarouselType } from 'embla-carousel';
 import { LooseOptionsType } from 'embla-carousel/components/Options';
 import { CreatePluginType, LoosePluginType } from 'embla-carousel/components/Plugins';
+import debounce from 'lodash-es/debounce';
 import { EmblaReInitController } from '../../reinit-controller';
 
 declare module 'embla-carousel/components/Plugins' {
@@ -37,6 +38,10 @@ function AutoSize(): AutoSizeType {
     intersectionHandler,
   );
 
+  const debouncedSetContainerHeight = debounce(() => setContainerHeight(), 200, {
+    trailing: true,
+  });
+
   function init(emblaApiInstance: EmblaCarouselType): void {
     emblaApi = emblaApiInstance;
     reInitController = new EmblaReInitController(emblaApi);
@@ -47,7 +52,13 @@ function AutoSize(): AutoSizeType {
       resizeObserver.observe(slide);
     }
 
-    emblaApi.on('settle', setContainerHeight);
+    // Need to examine container size on both settle and media load, as settle
+    // may happen before the media is loaded (which they subsequently changes
+    // the size to large than the maxHeight is set).
+    emblaApi
+      .containerNode()
+      .addEventListener('frigate-card:media:loaded', debouncedSetContainerHeight);
+    emblaApi.on('settle', debouncedSetContainerHeight);
   }
 
   function destroy(): void {
@@ -55,7 +66,10 @@ function AutoSize(): AutoSizeType {
     resizeObserver.disconnect();
     reInitController?.destroy();
 
-    emblaApi.off('settle', setContainerHeight);
+    emblaApi
+      .containerNode()
+      .removeEventListener('frigate-card:media:loaded', debouncedSetContainerHeight);
+    emblaApi.off('settle', debouncedSetContainerHeight);
   }
 
   function intersectionHandler(entries: IntersectionObserverEntry[]): void {
diff --git a/src/utils/embla/reinit-controller.ts b/src/utils/embla/reinit-controller.ts
index 572e0f9c..ff3f2287 100644
--- a/src/utils/embla/reinit-controller.ts
+++ b/src/utils/embla/reinit-controller.ts
@@ -50,9 +50,6 @@ export class EmblaReInitController {
 
   protected _debouncedReInit = debounce(
     () => {
-      // Allow the browser a moment to paint components that are inflight, to
-      // ensure accurate measurements are taken during the carousel
-      // reinitialization.
       this._scrolling = false;
       this._shouldReInitOnScrollStop = false;
       this._emblaApi?.reInit();
diff --git a/src/utils/media-grid-controller.ts b/src/utils/media-grid-controller.ts
index 7fd38146..4ce713fa 100644
--- a/src/utils/media-grid-controller.ts
+++ b/src/utils/media-grid-controller.ts
@@ -47,12 +47,10 @@ export class MediaGridController {
   protected _idAttribute: string;
 
   protected _throttledLayout = throttle(
-    () => {
-      window.requestAnimationFrame(() => this._masonry?.layout?.());
-    },
+    () => this._masonry?.layout?.(),
     // Throttle layout calls to larger than the masonry.js transitionDuration
     // value specified below.
-    400,
+    300,
     { trailing: true, leading: false },
   );
 
diff --git a/tests/utils/embla/plugins/auto-size/auto-size.test.ts b/tests/utils/embla/plugins/auto-size/auto-size.test.ts
index d8e06169..412c0fa5 100644
--- a/tests/utils/embla/plugins/auto-size/auto-size.test.ts
+++ b/tests/utils/embla/plugins/auto-size/auto-size.test.ts
@@ -15,7 +15,6 @@ import {
   createTestSlideNodes,
 } from '../../test-utils';
 
-// Mock out debouncing (used in the reinit controller).
 vi.mock('lodash-es/debounce', () => ({
   default: vi.fn((fn) => fn),
 }));
diff --git a/tests/utils/media-grid-controller.test.ts b/tests/utils/media-grid-controller.test.ts
index 15da4471..4f5b0092 100644
--- a/tests/utils/media-grid-controller.test.ts
+++ b/tests/utils/media-grid-controller.test.ts
@@ -1,5 +1,5 @@
 import Masonry from 'masonry-layout';
-import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { mock } from 'vitest-mock-extended';
 import { MediaLoadedInfo } from '../../src/types';
 import {
@@ -12,7 +12,6 @@ import {
   ResizeObserverMock,
   createSlot,
   createSlotHost,
-  requestAnimationFrameMock,
 } from '../test-utils';
 
 vi.mock('lodash-es/throttle', () => ({
@@ -82,10 +81,6 @@ describe('MediaGridController', () => {
     height: 20,
   };
 
-  beforeAll(() => {
-    window.requestAnimationFrame = requestAnimationFrameMock;
-  });
-
   beforeEach(() => {
     vi.clearAllMocks();
     vi.stubGlobal('MutationObserver', MutationObserverMock);