diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index b59f3663ff..2a2d976377 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -240,6 +240,7 @@ module Spree
             if response.cvv_result
               self.cvv_response_code = response.cvv_result['code']
               self.cvv_response_message = response.cvv_result['message']
+              self.require_authorization if self.cvv_response_message.present?
             end
           end
           __send__("#{success_state}!")
diff --git a/app/services/process_payment_intent.rb b/app/services/process_payment_intent.rb
index 9a1d499460..a856ae5ad5 100644
--- a/app/services/process_payment_intent.rb
+++ b/app/services/process_payment_intent.rb
@@ -41,6 +41,7 @@ class ProcessPaymentIntent
 
       Result.new(ok: true)
     else
+      payment.failed_authorization
       Result.new(ok: false, error: I18n.t("payment_could_not_complete"))
     end