diff --git a/app/views/instructeurs/dossiers/_header_bottom.html.haml b/app/views/instructeurs/dossiers/_header_bottom.html.haml
index ce922e524..0358c4aa0 100644
--- a/app/views/instructeurs/dossiers/_header_bottom.html.haml
+++ b/app/views/instructeurs/dossiers/_header_bottom.html.haml
@@ -7,7 +7,7 @@
         instructeur_dossier_path(dossier.procedure, dossier),
         notification: notifications_summary[:demande])
 
-      - if dossier.revision.types_de_champ.any?(&:piece_justificative?)
+      - if dossier.champs.map(&:piece_justificative_file).flatten.any?
         = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.attachments'),
           pieces_jointes_instructeur_dossier_path(dossier.procedure, dossier))
 
diff --git a/app/views/instructeurs/dossiers/pieces_jointes.html.haml b/app/views/instructeurs/dossiers/pieces_jointes.html.haml
index 386a31852..a0b1816a1 100644
--- a/app/views/instructeurs/dossiers/pieces_jointes.html.haml
+++ b/app/views/instructeurs/dossiers/pieces_jointes.html.haml
@@ -3,38 +3,34 @@
 = render partial: "header", locals: { dossier: @dossier }
 
 .fr-container
-  - if @champs_with_pieces_jointes.map(&:piece_justificative_file).flatten.none?
-    .empty-text
-      Ce dossier ne contient pas de pièces jointes
-  - else
-    .gallery.gallery-pieces-jointes{ "data-controller": "lightbox" }
-      - @champs_with_pieces_jointes.each do |champ|
-        - champ.piece_justificative_file.each do |attachment|
-          .gallery-item
-            - blob = attachment.blob
-            - if blob.content_type.in?(AUTHORIZED_PDF_TYPES)
-              = link_to blob.url, id: blob.id, data: { iframe: true, src: blob.url }, class: 'gallery-link', type: blob.content_type, title: "#{champ.libelle} -- #{blob.filename}" do
-                .thumbnail
-                  = image_tag("pdf-placeholder.png")
-                  .fr-btn.fr-btn--tertiary.fr-btn--icon-left.fr-icon-eye{ role: :button }
-                    Visualiser
-              .champ-libelle
-                = champ.libelle.truncate(25)
-              = render Attachment::ShowComponent.new(attachment: attachment, truncate: true)
-
-            - elsif blob.content_type.in?(AUTHORIZED_IMAGE_TYPES)
-              = link_to image_url(blob.url), title: "#{champ.libelle} -- #{blob.filename}", data: { src: blob.url }, class: 'gallery-link' do
-                .thumbnail
-                  = image_tag(attachment.variant(:medium), loading: :lazy)
-                  .fr-btn.fr-btn--tertiary.fr-btn--icon-left.fr-icon-eye{ role: :button }
-                    Visualiser
-              .champ-libelle
-                = champ.libelle.truncate(25)
-              = render Attachment::ShowComponent.new(attachment: attachment, truncate: true)
-
-            - else
+  .gallery.gallery-pieces-jointes{ "data-controller": "lightbox" }
+    - @champs_with_pieces_jointes.each do |champ|
+      - champ.piece_justificative_file.each do |attachment|
+        .gallery-item
+          - blob = attachment.blob
+          - if blob.content_type.in?(AUTHORIZED_PDF_TYPES)
+            = link_to blob.url, id: blob.id, data: { iframe: true, src: blob.url }, class: 'gallery-link', type: blob.content_type, title: "#{champ.libelle} -- #{blob.filename}" do
               .thumbnail
-                = image_tag('apercu-indisponible.png')
-              .champ-libelle
-                = champ.libelle.truncate(25)
-              = render Attachment::ShowComponent.new(attachment: attachment, truncate: true)
+                = image_tag("pdf-placeholder.png")
+                .fr-btn.fr-btn--tertiary.fr-btn--icon-left.fr-icon-eye{ role: :button }
+                  Visualiser
+            .champ-libelle
+              = champ.libelle.truncate(25)
+            = render Attachment::ShowComponent.new(attachment: attachment, truncate: true)
+
+          - elsif blob.content_type.in?(AUTHORIZED_IMAGE_TYPES)
+            = link_to image_url(blob.url), title: "#{champ.libelle} -- #{blob.filename}", data: { src: blob.url }, class: 'gallery-link' do
+              .thumbnail
+                = image_tag(attachment.variant(:medium), loading: :lazy)
+                .fr-btn.fr-btn--tertiary.fr-btn--icon-left.fr-icon-eye{ role: :button }
+                  Visualiser
+            .champ-libelle
+              = champ.libelle.truncate(25)
+            = render Attachment::ShowComponent.new(attachment: attachment, truncate: true)
+
+          - else
+            .thumbnail
+              = image_tag('apercu-indisponible.png')
+            .champ-libelle
+              = champ.libelle.truncate(25)
+            = render Attachment::ShowComponent.new(attachment: attachment, truncate: true)