diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 21f650a..e13896a 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,5 +1,5 @@
 {{- $image := .Page.Resources.GetMatch (printf "%s" (.Destination | safeURL)) -}}
-{{- if $image -}}
+{{- if and $image (ne (path.Ext .Destination) ".svg") -}}
 	{{- $alt := .PlainText | safeHTML -}}
 	<figure style="flex-grow: {{ div (mul $image.Width 100) $image.Height }}; flex-basis: {{ div (mul $image.Width 240) $image.Height }}px">
 		<a href="{{ $image.RelPermalink }}" data-size="{{ $image.Width }}x{{ $image.Height }}">
diff --git a/layouts/partials/helper/image.html b/layouts/partials/helper/image.html
index 8534592..8791aa7 100644
--- a/layouts/partials/helper/image.html
+++ b/layouts/partials/helper/image.html
@@ -16,7 +16,11 @@
         {{ if $pageResourceImage }}
             <!-- If image is found under page bundle -->
             {{ $result = merge $result (dict "permalink" $pageResourceImage.RelPermalink) }}
-            {{ $result = merge $result (dict "resource" $pageResourceImage) }}
+
+            <!-- Disable SVG image processing, not supported by Hugo -->
+            {{ if ne (path.Ext $imageValue) ".svg" }}
+                {{ $result = merge $result (dict "resource" $pageResourceImage) }}
+            {{ end }}
         {{ else }}
             <!-- Can not find the image under page bundle. Could be a relative linked image -->
             {{ $result = merge $result (dict "permalink" $imageValue) }}