diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index b3a32ca340..014f150a7d 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -52,6 +52,10 @@ module Spree
         .where(environment: [Rails.env, "", nil])
     }
 
+    def self.customer_credit
+      find_by(name: Rails.application.config.credit_payment_method[:name])
+    end
+
     def configured?
       !stripe? || stripe_configured?
     end
diff --git a/app/models/spree/payment_method/customer_credit.rb b/app/models/spree/payment_method/customer_credit.rb
index b532d04a20..95a00fcccf 100644
--- a/app/models/spree/payment_method/customer_credit.rb
+++ b/app/models/spree/payment_method/customer_credit.rb
@@ -54,9 +54,7 @@ module Spree
       private
 
       def payment_method
-        Spree::PaymentMethod.find_by(
-          name: Rails.application.config.credit_payment_method[:name]
-        )
+        Spree::PaymentMethod.customer_credit
       end
 
       def error_response(translation_key)
diff --git a/app/services/credit_payment_method/linker_service.rb b/app/services/credit_payment_method/linker_service.rb
index 2b9025e798..0064ad646b 100644
--- a/app/services/credit_payment_method/linker_service.rb
+++ b/app/services/credit_payment_method/linker_service.rb
@@ -44,7 +44,7 @@ module CreditPaymentMethod
     end
 
     def credit_payment_method
-      Spree::PaymentMethod.find_by(name: Rails.application.config.credit_payment_method[:name])
+      Spree::PaymentMethod.customer_credit
     end
 
     def create_credit_payment_method
diff --git a/spec/services/credit_payment_method/linker_service_spec.rb b/spec/services/credit_payment_method/linker_service_spec.rb
index 1b654800aa..731f23c4ba 100644
--- a/spec/services/credit_payment_method/linker_service_spec.rb
+++ b/spec/services/credit_payment_method/linker_service_spec.rb
@@ -42,9 +42,7 @@ RSpec.describe CreditPaymentMethod::LinkerService do
         )
         expect(api_payment_method.display_on).to eq("back_end")
 
-        credit_payment_method = Spree::PaymentMethod.find_by(
-          name: Rails.application.config.credit_payment_method[:name]
-        )
+        credit_payment_method = Spree::PaymentMethod.customer_credit
         expect(credit_payment_method).not_to be_nil
         expect(credit_payment_method.description).to eq(
           Rails.application.config.credit_payment_method[:description]