diff --git a/app/controllers/support_controller.rb b/app/controllers/support_controller.rb
index fdb634758..9a04d1563 100644
--- a/app/controllers/support_controller.rb
+++ b/app/controllers/support_controller.rb
@@ -26,8 +26,6 @@ class SupportController < ApplicationController
 
   def setup_context
     @dossier_id = dossier&.id
-    @type = params[:type]
-    @tags = params[:tags]
     @options = Helpscout::FormAdapter::OPTIONS
   end
 
diff --git a/app/views/support/index.html.haml b/app/views/support/index.html.haml
index 5b1a5a307..09b019893 100644
--- a/app/views/support/index.html.haml
+++ b/app/views/support/index.html.haml
@@ -14,13 +14,13 @@
           = label_tag :email do
             Email
             %span.mandatory *
-          = text_field_tag :email, '', required: true
+          = text_field_tag :email, params[:email], required: true
 
       .contact-champ
         = label_tag :type do
           Votre problème
           %span.mandatory *
-        = select_tag :type, options_for_select(@options, @type)
+        = select_tag :type, options_for_select(@options, params[:type])
 
       .contact-champ
         = label_tag :dossier_id, 'Numéro du dossier concerné'
@@ -30,19 +30,19 @@
         = label_tag :subject do
           Sujet
           %span.mandatory *
-        = text_field_tag :subject, '', required: true
+        = text_field_tag :subject, params[:subject], required: true
 
       .contact-champ
         = label_tag :text do
           Message
           %span.mandatory *
-        = text_area_tag :text, '', rows: 6, required: true
+        = text_area_tag :text, params[:text], rows: 6, required: true
 
       .contact-champ
         = label_tag :text, 'Pièce jointe'
         = file_field_tag :file
 
-      = hidden_field_tag :tags, @tags
+      = hidden_field_tag :tags, params[:tags]
 
       .send-wrapper
         = button_tag 'Envoyer le message', type: :submit, class: 'button send primary'