diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 276c48911..9b0d94493 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -92,7 +92,7 @@ class NotificationMailer < ApplicationMailer
   def set_jdma
     return unless params[:state] == Dossier.states.fetch(:en_construction)
 
-    @jdma_html = @dossier.procedure.monavis_embed.presence
+    @jdma_html = @dossier.procedure.monavis_embed_html_source("email").presence
   end
 
   def set_dossier
diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index 11cec13d8..337970e89 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -1008,6 +1008,10 @@ class Procedure < ApplicationRecord
     update!(closing_reason: nil, closing_details: nil, replaced_by_procedure_id: nil, closing_notification_brouillon: false, closing_notification_en_cours: false)
   end
 
+  def monavis_embed_html_source(source)
+    monavis_embed.gsub('nd_source=button', "nd_source=#{source}").gsub('<a ', '<a target="_blank" rel="noopener noreferrer" ')
+  end
+
   private
 
   def validate_auto_archive_on_in_the_future
diff --git a/app/views/layouts/mailers/_jdma.html.haml b/app/views/layouts/mailers/_jdma.html.haml
index e88cd4dc2..4d6ce0af9 100644
--- a/app/views/layouts/mailers/_jdma.html.haml
+++ b/app/views/layouts/mailers/_jdma.html.haml
@@ -5,6 +5,6 @@
     %strong Aidez-nous à améliorer ce service !
     %br
     Donnez-nous votre avis, cela ne prend que 2 minutes.
-  != @jdma_html.gsub('nd_source=button', 'nd_source=email').gsub('<a ', '<a target="_blank" rel="noopener noreferrer" ')
+  != @jdma_html
 
 = vertical_margin(20)
diff --git a/app/views/users/dossiers/_merci.html.haml b/app/views/users/dossiers/_merci.html.haml
index c25957a48..3334d0f46 100644
--- a/app/views/users/dossiers/_merci.html.haml
+++ b/app/views/users/dossiers/_merci.html.haml
@@ -27,4 +27,4 @@
           %p.fr-mt-5w.fr-mb-1w
             %strong= t('views.users.dossiers.merci.jdma_l1')
           %p= t('views.users.dossiers.merci.jdma_l2')
-          != procedure.monavis_embed.gsub('nd_source=button', 'nd_source=site').gsub('<a ', '<a target="_blank" rel="noopener noreferrer" ')
+          != procedure.monavis_embed_html_source("site")