diff --git a/src/common/config/public/ClientConfig.ts b/src/common/config/public/ClientConfig.ts
index dfaf99a7..85a7ef5d 100644
--- a/src/common/config/public/ClientConfig.ts
+++ b/src/common/config/public/ClientConfig.ts
@@ -123,6 +123,8 @@ export class PhotoConvertingConfig {
 export class ClientPhotoConfig {
   @ConfigProperty()
   Converting: PhotoConvertingConfig = new PhotoConvertingConfig();
+  @ConfigProperty({description: 'Enables loading the full resolution image on zoom in the ligthbox (preview).'})
+  loadFullImageOnZoom: boolean = true;
 }
 
 @SubConfigClass()
diff --git a/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
index 8b5e213c..f9c9f779 100644
--- a/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
+++ b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
@@ -1,6 +1,6 @@
 import {Component, ElementRef, EventEmitter, Input, OnChanges, Output, ViewChild} from '@angular/core';
 import {GridMedia} from '../../grid/GridMedia';
-import {MediaDTO, MediaDTOUtils} from '../../../../../../common/entities/MediaDTO';
+import {MediaDTOUtils} from '../../../../../../common/entities/MediaDTO';
 import {DomSanitizer, SafeStyle} from '@angular/platform-browser';
 import {SupportedFormats} from '../../../../../../common/SupportedFormats';
 import {Config} from '../../../../../../common/config/public/Config';
@@ -164,7 +164,8 @@ export class GalleryLightboxMediaComponent implements OnChanges {
       return;
     }
 
-    if (this.zoom === 1) {
+    if (this.zoom === 1 ||
+      Config.Client.Media.Photo.loadFullImageOnZoom === false) {
       if (this.photo.src == null) {
         if (Config.Client.Media.Photo.Converting.enabled === true) {
           this.photo.src = this.gridMedia.getBestFitMediaPath();
diff --git a/src/frontend/app/ui/settings/photo/photo.settings.component.html b/src/frontend/app/ui/settings/photo/photo.settings.component.html
index 391b1c5c..ffd449c6 100644
--- a/src/frontend/app/ui/settings/photo/photo.settings.component.html
+++ b/src/frontend/app/ui/settings/photo/photo.settings.component.html
@@ -33,6 +33,15 @@
         required="true">
       </app-settings-entry>
 
+      <app-settings-entry
+        name="Load full resolution image on zoom"
+        description="Enables loading the full resolution image on zoom in the ligthbox (preview)."
+        i18n-description i18n-name
+        [ngModel]="states.client.loadFullImageOnZoom"
+        [simplifiedMode]="simplifiedMode"
+        [disabled]="!states.client.Converting.enabled.value">
+      </app-settings-entry>
+
 
       <button class="btn btn-success float-right"
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
diff --git a/src/frontend/translate/messages.en.xlf b/src/frontend/translate/messages.en.xlf
index 8905492a..7c7a3aab 100644
--- a/src/frontend/translate/messages.en.xlf
+++ b/src/frontend/translate/messages.en.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.es.xlf b/src/frontend/translate/messages.es.xlf
index 4b04e722..92b12295 100644
--- a/src/frontend/translate/messages.es.xlf
+++ b/src/frontend/translate/messages.es.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.fr.xlf b/src/frontend/translate/messages.fr.xlf
index b4467d72..82e62784 100644
--- a/src/frontend/translate/messages.fr.xlf
+++ b/src/frontend/translate/messages.fr.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.hu.xlf b/src/frontend/translate/messages.hu.xlf
index 15b48cfb..d05bc76f 100644
--- a/src/frontend/translate/messages.hu.xlf
+++ b/src/frontend/translate/messages.hu.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Örökké</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.it.xlf b/src/frontend/translate/messages.it.xlf
index 4d1f77fb..0af775e6 100644
--- a/src/frontend/translate/messages.it.xlf
+++ b/src/frontend/translate/messages.it.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.ro.xlf b/src/frontend/translate/messages.ro.xlf
index dce72057..2e1fcb26 100644
--- a/src/frontend/translate/messages.ro.xlf
+++ b/src/frontend/translate/messages.ro.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.ru.xlf b/src/frontend/translate/messages.ru.xlf
index 0df43a16..98452032 100644
--- a/src/frontend/translate/messages.ru.xlf
+++ b/src/frontend/translate/messages.ru.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/frontend/translate/messages.sv.xlf b/src/frontend/translate/messages.sv.xlf
index 63c46bc3..bdfacca6 100644
--- a/src/frontend/translate/messages.sv.xlf
+++ b/src/frontend/translate/messages.sv.xlf
@@ -2736,6 +2736,14 @@
         <source>Forever</source>
         <target>Forever</target>
       </trans-unit>
+      <trans-unit id="9104939499698249234" datatype="html">
+        <source>Load full resolution image on zoom</source>
+        <target>Load full resolution image on zoom</target>
+      </trans-unit>
+      <trans-unit id="6870206109332559881" datatype="html">
+        <source>Enables loading the full resolution image on zoom in the ligthbox (preview).</source>
+        <target>Enables loading the full resolution image on zoom in the ligthbox (preview).</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file