diff --git a/src/card.ts b/src/card.ts
index 55d3881c..5dd5079d 100644
--- a/src/card.ts
+++ b/src/card.ts
@@ -1032,8 +1032,8 @@ export class FrigateCard extends LitElement {
     return !(
       (screenfull.isEnabled && screenfull.isFullscreen) ||
       aspectRatioMode == 'unconstrained' ||
-      (aspectRatioMode == 'dynamic' && this._view?.isMediaView() || 
-      this._message != null)
+      (aspectRatioMode == 'dynamic' && this._view?.isMediaView()) ||
+      this._message != null
     );
   }
 
@@ -1175,25 +1175,16 @@ export class FrigateCard extends LitElement {
       return html``;
     }
 
-    const galleryClasses = {
-      hidden: this._getConfig().live.preload && !this._view.isGalleryView(),
-    };
-    const viewerClasses = {
-      hidden: this._getConfig().live.preload && !this._view.isViewerView(),
-    };
+    // Render but hide the live view if there's a message, or if it's preload
+    // mode and the view is not live.
     const liveClasses = {
-      hidden: this._getConfig().live.preload && this._view.view != 'live',
-    };
-    const imageClasses = {
-      hidden: this._getConfig().live.preload && this._view.view != 'image',
+      hidden:
+        !!this._message || (this._getConfig().live.preload && !this._view.is('live')),
     };
 
     return html`
       ${!this._message && this._view.is('image')
-        ? html` <frigate-card-image
-            .imageConfig=${this._getConfig().image}
-            class="${classMap(imageClasses)}"
-          >
+        ? html` <frigate-card-image .imageConfig=${this._getConfig().image}>
           </frigate-card-image>`
         : ``}
       ${!this._message && this._view.isGalleryView()
@@ -1201,7 +1192,6 @@ export class FrigateCard extends LitElement {
             .hass=${this._hass}
             .view=${this._view}
             .cameraConfig=${cameraConfig}
-            class="${classMap(galleryClasses)}"
           >
           </frigate-card-gallery>`
         : ``}
@@ -1212,7 +1202,6 @@ export class FrigateCard extends LitElement {
             .cameraConfig=${cameraConfig}
             .viewerConfig=${this._getConfig().event_viewer}
             .resolvedMediaCache=${this._resolvedMediaCache}
-            class="${classMap(viewerClasses)}"
           >
           </frigate-card-viewer>`
         : ``}
@@ -1223,7 +1212,7 @@ export class FrigateCard extends LitElement {
         // Note: <frigate-card-live> uses the baseConfig rather than the
         // overriden config, as it does it's own overriding as part of the
         // camera carousel.
-        (!this._message && this._view.is('live')) || this._getConfig().live.preload
+        this._getConfig().live.preload || (!this._message && this._view.is('live'))
           ? html`
               <frigate-card-live
                 .hass=${this._hass}
diff --git a/src/components/live.ts b/src/components/live.ts
index 0c4737cd..e9405d17 100644
--- a/src/components/live.ts
+++ b/src/components/live.ts
@@ -132,6 +132,7 @@ export class FrigateCardLive extends LitElement {
       try {
         parent = await BrowseMediaUtil.browseMediaQuery(this.hass, browseMediaParams);
       } catch (e) {
+        console.info('thumb exception')
         return dispatchErrorMessageEvent(this, (e as Error).message);
       }
 
diff --git a/src/scss/card.scss b/src/scss/card.scss
index db125ce5..a0ace685 100644
--- a/src/scss/card.scss
+++ b/src/scss/card.scss
@@ -71,7 +71,8 @@ ha-card {
   background-color: var(--secondary-background-color, black);
 }
 
-frigate-card-gallery.hidden,frigate-card-viewer.hidden,frigate-card-live.hidden  {
+frigate-card-live.hidden  {
+  // Live view will be rendered but hidden for live preloading.
   display: none;
 }