diff --git a/view/templates/content/image/single.tpl b/view/templates/content/image/single.tpl
index b3dfb7413..ea19c48a5 100644
--- a/view/templates/content/image/single.tpl
+++ b/view/templates/content/image/single.tpl
@@ -1,5 +1,10 @@
 {{if $image->preview}}
 <a data-fancybox="{{$image->uriId}}" href="{{$image->url}}"><img src="{{$image->preview}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy"></a>
 {{else}}
-<img src="{{$image->url}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy">
+<figure>
+	<img src="{{$image->url}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy">
+	{{if $image->description}}
+	<figcaption>{{$image->description}}</figcaption>
+    {{/if}}
+</figure>
 {{/if}}
diff --git a/view/templates/content/image/single_with_height_allocation.tpl b/view/templates/content/image/single_with_height_allocation.tpl
index 1d70194be..60b4669e3 100644
--- a/view/templates/content/image/single_with_height_allocation.tpl
+++ b/view/templates/content/image/single_with_height_allocation.tpl
@@ -12,6 +12,9 @@
 		</a>
     {{else}}
 		<img src="{{$image->url}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy">
+        {{if $image->description}}
+		    <figcaption>{{$image->description}}</figcaption>
+        {{/if}}
     {{/if}}
 </figure>