diff --git a/app/models/avis.rb b/app/models/avis.rb
index 334625fe7..9efa98164 100644
--- a/app/models/avis.rb
+++ b/app/models/avis.rb
@@ -28,7 +28,7 @@ class Avis < ApplicationRecord
   has_one :expert, through: :experts_procedure
   has_one :procedure, through: :experts_procedure
 
-  has_many :targeted_user_links, dependent: :destroy, inverse_of: :target_model, foreign_key: 'target_model_id'
+  has_many :targeted_user_links, as: :target_model, dependent: :destroy, inverse_of: :target_model
 
   FILE_MAX_SIZE = 20.megabytes
   validates :piece_justificative_file,
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 3b9031856..dbdfd3a67 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -16,7 +16,7 @@ class Invite < ApplicationRecord
 
   belongs_to :dossier, optional: false
   belongs_to :user, optional: true
-  has_one :targeted_user_link, dependent: :destroy, inverse_of: :target_model, foreign_key: 'target_model_id'
+  has_one :targeted_user_link, as: :target_model, dependent: :destroy, inverse_of: :target_model
 
   before_validation -> { sanitize_email(:email) }