diff --git a/app/services/commentaire_service.rb b/app/services/commentaire_service.rb
index b7e8ef206..fa3b9a576 100644
--- a/app/services/commentaire_service.rb
+++ b/app/services/commentaire_service.rb
@@ -12,9 +12,6 @@ class CommentaireService
     end
 
     def build_with_email(email, dossier, params)
-      if !dossier.messagerie_available?
-        raise ArgumentError, "Commentaires cannot be added to brouillons or archived Dossiers"
-      end
       attributes = params.merge(email: email, dossier: dossier)
       Commentaire.new(attributes)
     end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0c93feb51..3027c6cf6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -110,7 +110,7 @@ Rails.application.configure do
   }
 
   # The Content-Security-Policy is NOT in Report-Only mode
-  config.content_security_policy_report_only = false
+  config.content_security_policy_report_only = true
 
   config.lograge.enabled = ENV['LOGRAGE_ENABLED'] == 'enabled'
 end