diff --git a/elements/nuxeo-document-attachments/nuxeo-document-attachments.js b/elements/nuxeo-document-attachments/nuxeo-document-attachments.js
index 8bedfd2bf0..1695f54735 100644
--- a/elements/nuxeo-document-attachments/nuxeo-document-attachments.js
+++ b/elements/nuxeo-document-attachments/nuxeo-document-attachments.js
@@ -166,7 +166,6 @@ Polymer({
   },
 
   _getFileValue() {
-    const fileName = this.document.type === 'File' && this.xpath === 'files:files' ? 'file' : '';
-    return fileName;
+    return this.xpath === 'files:files' ? 'file' : '';
   },
 });
diff --git a/elements/nuxeo-dropzone/nuxeo-dropzone.js b/elements/nuxeo-dropzone/nuxeo-dropzone.js
index 69274a4807..426dc5ca7e 100644
--- a/elements/nuxeo-dropzone/nuxeo-dropzone.js
+++ b/elements/nuxeo-dropzone/nuxeo-dropzone.js
@@ -220,7 +220,7 @@ Polymer({
       </template>
     </div>
 
-    <div id="dropzone" hidden$="[[!_isDropzoneVisible(hasFiles, multiple, updateDocument, blobList)]]">
+    <div id="dropzone" hidden$="[[!_isDropzoneVisible(document, hasFiles, multiple, updateDocument, blobList)]]">
       <div id="container">
         <button class="link" on-click="open">
           [[_computeMessage(draggingFiles, message, dragContentMessage, i18n)]]
@@ -581,7 +581,18 @@ Polymer({
     return this.i18n && this.draggingFiles ? this.i18n(this.dragContentMessage) : this.i18n(this.message);
   },
 
-  _isDropzoneVisible() {
+  _isDropzoneVisible(document) {
+    if (
+      document &&
+      document.isUnderRetentionOrLegalHold &&
+      document.retainedProperties &&
+      document.retainedProperties.length > 0
+    ) {
+      if (document.retainedProperties.indexOf(this.xpath) !== -1) {
+        return false;
+      }
+    }
+
     // Area to drop files should stay visible when the element is attached to a blob list property
     // and, e.g, when using the element on a form: creation or edition of documents.
     // This will allow the user to manage the list of files.
diff --git a/test/nuxeo-dropzone.test.js b/test/nuxeo-dropzone.test.js
new file mode 100644
index 0000000000..eabaf8181a
--- /dev/null
+++ b/test/nuxeo-dropzone.test.js
@@ -0,0 +1,49 @@
+/**
+ @license
+ ©2023 Hyland Software, Inc. and its affiliates. All rights reserved. 
+All Hyland product names are registered or unregistered trademarks of Hyland Software, Inc. or its affiliates.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import { fixture, html } from '@nuxeo/testing-helpers';
+import '../elements/nuxeo-dropzone/nuxeo-dropzone';
+
+suite('nuxeo-dropzone', () => {
+  let element;
+  setup(async () => {
+    element = await fixture(
+      html`
+        <nuxeo-dropzone></nuxeo-dropzone>
+      `,
+    );
+  });
+
+  suite('should return whether property is under retention', () => {
+    const document = {
+      isUnderRetentionOrLegalHold: true,
+      retainedProperties: ['checkext:single', 'file:content'],
+    };
+    test('when xpath =  checkext:single', () => {
+      element.xpath = 'checkext:single';
+      expect(element._isDropzoneVisible(document)).to.eql(false);
+    });
+    test('when xpath =  checkext:multiple', () => {
+      element.xpath = 'checkext:multiple';
+      expect(element._isDropzoneVisible(document)).to.eql(true);
+    });
+    test('when xpath =  file:content, for document viewer', () => {
+      element.xpath = 'file:content';
+      expect(element._isDropzoneVisible(document)).to.eql(false);
+    });
+  });
+});