diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/EpisodeCard.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/EpisodeCard.kt
index 78080c3a..04f3170f 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/EpisodeCard.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/EpisodeCard.kt
@@ -72,7 +72,22 @@ fun EpisodeCard(
     val width = imageHeight * aspectRatio
     val height = imageWidth * (1f / aspectRatio)
     val density = LocalDensity.current
-    val imageWidthPx = remember(imageWidth) { with(density) { imageWidth.roundToPx() } }
+    val fillWidthPx =
+        remember(imageWidth, density) {
+            if (imageWidth != Dp.Unspecified) {
+                with(density) { imageWidth.roundToPx() }
+            } else {
+                null
+            }
+        }
+    val fillHeightPx =
+        remember(imageHeight, density) {
+            if (imageHeight != Dp.Unspecified) {
+                with(density) { imageHeight.roundToPx() }
+            } else {
+                null
+            }
+        }
     Column(
         verticalArrangement = Arrangement.spacedBy(spaceBetween),
         modifier = modifier.size(width, height),
@@ -105,7 +120,8 @@ fun EpisodeCard(
                     watchedPercent = dto?.userData?.playedPercentage,
                     numberOfVersions = dto?.mediaSourceCount ?: 0,
                     useFallbackText = false,
-                    fillWidth = imageWidthPx,
+                    fillWidth = fillWidthPx,
+                    fillHeight = fillHeightPx,
                     modifier =
                         Modifier
                             .fillMaxSize(),
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
index 31a36b49..1ff5b468 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
@@ -714,8 +714,8 @@ fun SearchPage(
                                         onClick.invoke()
                                     },
                                     onLongClick = onLongClick,
-                                    imageHeight = 140.dp,
-                                    modifier = mod.padding(horizontal = 8.dp),
+                                    imageHeight = LocalInterfaceCustomization.current.episodeCardHeightDp.dp,
+                                    modifier = mod,
                                 )
                             },
                         )