diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte
index 600ba1c01a..b91e21ef8c 100644
--- a/packages/presentation/src/components/PDFViewer.svelte
+++ b/packages/presentation/src/components/PDFViewer.svelte
@@ -24,6 +24,7 @@
 
   export let file: string
   export let name: string
+  export let contentType: string | undefined
 
   const dispatch = createEventDispatcher()
 
@@ -47,7 +48,11 @@
     </div>
   </div>
 
-  <iframe class="flex-grow content" src={getFileUrl(file)} title=""/>
+  {#if contentType && contentType.startsWith('image/') }
+    <img src={getFileUrl(file)} alt=''/>
+  {:else}
+    <iframe class="flex-grow content" src={getFileUrl(file)} title=""/>
+  {/if}
 
   <div class="flex-between footer">
     <div class="flex-row-reverse">
diff --git a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
index c2e89e27fc..a827e80f15 100644
--- a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
@@ -42,14 +42,14 @@
   {#if openEmbedded(value.type)}
     <div class="flex-center icon" on:click={() => {
       closeTooltip()
-      showPopup(PDFViewer, { file: value.file, name: value.name }, 'right')
+      showPopup(PDFViewer, { file: value.file, name: value.name, contentType: value.type }, 'right')
     }}>{iconLabel(value.name)}</div>
   {:else}
     <a class="no-line" href={getFileUrl(value.file)} download={value.name}><div class="flex-center icon">{iconLabel(value.name)}</div></a>
   {/if}
   <div class="flex-col info">
     {#if openEmbedded(value.type)}
-      <div class="name" on:click={() => { closeTooltip(); showPopup(PDFViewer, { file: value.file, name: value.name }, 'right') }}>{trimFilename(value.name)}</div>
+      <div class="name" on:click={() => { closeTooltip(); showPopup(PDFViewer, { file: value.file, name: value.name, contentType: value.type }, 'right') }}>{trimFilename(value.name)}</div>
     {:else}
       <div class="name"><a href={getFileUrl(value.file)} download={value.name}>{trimFilename(value.name)}</a></div> 
     {/if}