diff --git a/jsHelper/spicetifyWrapper.js b/jsHelper/spicetifyWrapper.js
index 93612f0d56..7fef3c74e8 100644
--- a/jsHelper/spicetifyWrapper.js
+++ b/jsHelper/spicetifyWrapper.js
@@ -551,7 +551,12 @@ window.Spicetify = {
 					m => m.toString().includes("?highlight") && m.toString().includes("headerText") && m.toString().includes("imageContainer")
 				),
 				Hero: functionModules.find(m => m?.toString().includes('"herocard-click-handler"')),
-				CardImage: reactComponentsUI.CardImage,
+				CardImage: functionModules.find(
+					m =>
+						m.toString().includes("isHero") &&
+						(m.toString().includes("withWaves") || m.toString().includes("isCircular")) &&
+						m.toString().includes("imageWrapper")
+				),
 				...Object.fromEntries(cards)
 			},
 			Router: functionModules.find(m => m.toString().includes("navigationType") && m.toString().includes("static")),