diff --git a/ui/nuxeo-document-thumbnail/nuxeo-document-thumbnail.js b/ui/nuxeo-document-thumbnail/nuxeo-document-thumbnail.js
index 6dced83ec..ef554ad99 100644
--- a/ui/nuxeo-document-thumbnail/nuxeo-document-thumbnail.js
+++ b/ui/nuxeo-document-thumbnail/nuxeo-document-thumbnail.js
@@ -75,13 +75,20 @@ import { I18nBehavior } from '../nuxeo-i18n-behavior';
     }
 
     _thumbnail(doc) {
-      return doc &&
+      if (
+        doc &&
         doc.uid &&
         doc.contextParameters &&
         doc.contextParameters.thumbnail &&
         doc.contextParameters.thumbnail.url
-        ? doc.contextParameters.thumbnail.url
-        : '';
+      ) {
+        if (!this.isFollowRedirectEnabled()) {
+          const splitter = doc.contextParameters.thumbnail.url.indexOf('?') > -1 ? '&' : '?';
+          doc.contextParameters.thumbnail.url = `${doc.contextParameters.thumbnail.url}${splitter}clientReason=view`;
+        }
+        return doc.contextParameters.thumbnail.url;
+      }
+      return '';
     }
 
     _error() {
@@ -93,6 +100,12 @@ import { I18nBehavior } from '../nuxeo-i18n-behavior';
     _title(doc) {
       return doc && doc.title ? this.i18n('accessibility.thumbnail', doc.title) : '';
     }
+
+    isFollowRedirectEnabled() {
+      const followRedirect =
+        Nuxeo && Nuxeo.UI && Nuxeo.UI.config && Nuxeo.UI.config.url && Nuxeo.UI.config.url.followRedirect;
+      return followRedirect ? String(followRedirect).toLowerCase() === 'true' : false;
+    }
   }
   customElements.define(DocumentThumbnail.is, DocumentThumbnail);
   Nuxeo.DocumentThumbnail = DocumentThumbnail;
diff --git a/ui/nuxeo-justified-grid/nuxeo-justified-grid-item.js b/ui/nuxeo-justified-grid/nuxeo-justified-grid-item.js
index 4c0b85b7a..259e018ca 100644
--- a/ui/nuxeo-justified-grid/nuxeo-justified-grid-item.js
+++ b/ui/nuxeo-justified-grid/nuxeo-justified-grid-item.js
@@ -93,9 +93,26 @@ import '@polymer/iron-image/iron-image.js';
     }
 
     _url(doc) {
-      return doc && doc.contextParameters && doc.contextParameters.thumbnail && doc.contextParameters.thumbnail.url
-        ? doc.contextParameters.thumbnail.url
-        : '';
+      if (
+        doc &&
+        doc.uid &&
+        doc.contextParameters &&
+        doc.contextParameters.thumbnail &&
+        doc.contextParameters.thumbnail.url
+      ) {
+        if (!this.isFollowRedirectEnabled()) {
+          const splitter = doc.contextParameters.thumbnail.url.indexOf('?') > -1 ? '&' : '?';
+          doc.contextParameters.thumbnail.url = `${doc.contextParameters.thumbnail.url}${splitter}clientReason=view`;
+        }
+        return doc.contextParameters.thumbnail.url;
+      }
+      return '';
+    }
+
+    isFollowRedirectEnabled() {
+      const followRedirect =
+        Nuxeo && Nuxeo.UI && Nuxeo.UI.config && Nuxeo.UI.config.url && Nuxeo.UI.config.url.followRedirect;
+      return followRedirect ? String(followRedirect).toLowerCase() === 'true' : false;
     }
   }