diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 9d777a48a..eb0c573f0 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -121,11 +121,15 @@ class Dossier < ActiveRecord::Base
   end
 
   def ordered_champs
-    champs.includes(:type_de_champ).order('types_de_champ.order_place')
+    # TODO: use the line below when the procedure preview does not leak champ with dossier_id == 0
+    # champs.joins(:type_de_champ).order('types_de_champ.order_place')
+    champs.joins(', types_de_champ').where("champs.type_de_champ_id = types_de_champ.id AND types_de_champ.procedure_id = #{procedure.id}").order('order_place')
   end
 
   def ordered_champs_private
-    champs_private.includes(:type_de_champ).order('types_de_champ.order_place')
+    # TODO: use the line below when the procedure preview does not leak champ with dossier_id == 0
+    # champs_private.includes(:type_de_champ).order('types_de_champ.order_place')
+    champs_private.joins(', types_de_champ').where("champs.type_de_champ_id = types_de_champ.id AND types_de_champ.procedure_id = #{procedure.id}").order('order_place')
   end
 
   def ordered_pieces_justificatives