diff --git a/src/components/Common/CachedImage/index.tsx b/src/components/Common/CachedImage/index.tsx
index 3b1a67f4..96af5489 100644
--- a/src/components/Common/CachedImage/index.tsx
+++ b/src/components/Common/CachedImage/index.tsx
@@ -7,21 +7,18 @@ const imageLoader: ImageLoader = ({ src }) => src;
 /**
  * The CachedImage component should be used wherever
  * we want to offer the option to locally cache images.
- *
- * It uses the `next/image` Image component but overrides
- * the `unoptimized` prop based on the application setting `cacheImages`.
  **/
 const CachedImage = ({ src, ...props }: ImageProps) => {
   const { currentSettings } = useSettings();
 
   let imageUrl = src;
 
-  if (
-    typeof imageUrl === 'string' &&
-    imageUrl.startsWith('https://image.tmdb.org') &&
-    currentSettings.cacheImages
-  ) {
-    imageUrl = imageUrl.replace('https://image.tmdb.org', '/imageproxy');
+  if (typeof imageUrl === 'string') {
+    const parsedUrl = new URL(imageUrl);
+
+    if (parsedUrl.host === 'image.tmdb.org' && currentSettings.cacheImages) {
+      imageUrl = imageUrl.replace('https://image.tmdb.org', '/imageproxy');
+    }
   }
 
   return <Image unoptimized loader={imageLoader} src={imageUrl} {...props} />;