diff --git a/layouts/partials/article-link/_shortcode.html b/layouts/partials/article-link/_shortcode.html
index d22e07d6..3d13844b 100644
--- a/layouts/partials/article-link/_shortcode.html
+++ b/layouts/partials/article-link/_shortcode.html
@@ -48,18 +48,12 @@
   {{ end }}
   {{ if $target.Params.hideFeatureImage }}{{ $featured = false }}{{ end }}
   {{ with $featured }}
-    {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg") }}
-      {{ with . }}
-        <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
-    {{ else }}
-      {{ with .Resize "600x" }}
-        <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
+    {{ $featuredURL := .RelPermalink }}
+    {{ if not (or $disableImageOptimization (eq .MediaType.SubType "svg")) }}
+      {{ $featuredURL = (.Resize "600x").RelPermalink }}
     {{ end }}
+    <div class="{{ $articleImageClasses }}" style="background-image:url({{ $featuredURL }});"></div>
   {{ end }}
-
-
   <div class="{{ $articleInnerClasses }}">
     <div class="items-center text-start text-xl font-semibold">
       {{ with $target.Params.externalUrl }}
diff --git a/layouts/partials/article-link/card-related.html b/layouts/partials/article-link/card-related.html
index 5c04e221..9e5254b4 100644
--- a/layouts/partials/article-link/card-related.html
+++ b/layouts/partials/article-link/card-related.html
@@ -17,19 +17,11 @@
     {{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}
   {{ end }}
   {{ with $featured }}
-    {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg") }}
-      {{ with . }}
-        <div
-          class="thumbnail_card_related nozoom w-full"
-          style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
-    {{ else }}
-      {{ with .Resize "600x" }}
-        <div
-          class="thumbnail_card_related nozoom w-full"
-          style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
+    {{ $featuredURL := .RelPermalink }}
+    {{ if not (or $disableImageOptimization (eq .MediaType.SubType "svg")) }}
+      {{ $featuredURL = (.Resize "600x").RelPermalink }}
     {{ end }}
+    <div class="thumbnail_card_related nozoom w-full" style="background-image:url({{ $featuredURL }});"></div>
   {{ end }}
   {{ if and .Draft .Site.Params.article.showDraftLabel }}
     <span class="absolute top-0 right-0 m-2">
diff --git a/layouts/partials/article-link/card.html b/layouts/partials/article-link/card.html
index cbce15df..df347f35 100644
--- a/layouts/partials/article-link/card.html
+++ b/layouts/partials/article-link/card.html
@@ -18,15 +18,11 @@
   {{ end }}
   {{ if .Params.hideFeatureImage }}{{ $featured = false }}{{ end }}
   {{ with $featured }}
-    {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg") }}
-      {{ with . }}
-        <div class="thumbnail_card nozoom w-full" style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
-    {{ else }}
-      {{ with .Resize "600x" }}
-        <div class="thumbnail_card nozoom w-full" style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
+    {{ $featuredURL := .RelPermalink }}
+    {{ if not (or $disableImageOptimization (eq .MediaType.SubType "svg")) }}
+      {{ $featuredURL = (.Resize "600x").RelPermalink }}
     {{ end }}
+    <div class="thumbnail_card nozoom w-full" style="background-image:url({{ $featuredURL }});"></div>
   {{ end }}
   {{ if and .Draft .Site.Params.article.showDraftLabel }}
     <span class="absolute top-0 right-0 m-2">
diff --git a/layouts/partials/article-link/simple.html b/layouts/partials/article-link/simple.html
index c7e10e4f..7d819dc0 100644
--- a/layouts/partials/article-link/simple.html
+++ b/layouts/partials/article-link/simple.html
@@ -46,18 +46,12 @@
   {{ end }}
   {{ if .Params.hideFeatureImage }}{{ $featured = false }}{{ end }}
   {{ with $featured }}
-    {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg") }}
-      {{ with . }}
-        <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
-    {{ else }}
-      {{ with .Resize "600x" }}
-        <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
-      {{ end }}
+    {{ $featuredURL := .RelPermalink }}
+    {{ if not (or $disableImageOptimization (eq .MediaType.SubType "svg")) }}
+      {{ $featuredURL = (.Resize "600x").RelPermalink }}
     {{ end }}
+    <div class="{{ $articleImageClasses }}" style="background-image:url({{ $featuredURL }});"></div>
   {{ end }}
-
-
   <div class="{{ $articleInnerClasses }}">
     <div class="items-center text-start text-xl font-semibold">
       {{ with .Params.externalUrl }}