diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 66c401cd8a..8126ad851c 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -22,7 +22,7 @@ module Spree
 
     has_one :adjustment, as: :source, dependent: :destroy
 
-    before_validation :validate_source
+    validate :validate_source
     before_save :set_unique_identifier
 
     after_save :create_payment_profile, if: :profiles_supported?