diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js
index c0830e100b97e70c685846127639c5d3b7afbd5d..258192ce3c81eaf4788a524ce93f56f77aa2e982 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js
@@ -34,7 +34,7 @@ function ImagePreviewIconLoader() {
     }
 
     this._shouldLoadPreview = function(node) {
-        return ! node.data.previewLoaded && node.data.fileSize <= profile.datasetViewerMaxFilesizeForImagePreview;
+        return ! node.data.previewLoading && ! node.data.previewLoaded && node.data.fileSize <= profile.datasetViewerMaxFilesizeForImagePreview;
     }
 
     this._addToQueue = function(node) {
@@ -89,6 +89,8 @@ function ImagePreviewIconLoader() {
      */
     this._loadImagePreview = function(params) {
 
+        params.node.data.previewLoading = true;
+
         var $span = $(params.node.span);
         var $imageContainer = $span.children("#image-container");
         
@@ -122,6 +124,7 @@ function ImagePreviewIconLoader() {
             $imageContainer.append($iconImg);
 
             params.node.data.previewLoaded = true;
+            params.node.data.previewLoading = false;
             params.done();
         });
     }