diff --git a/Koha/Account.pm b/Koha/Account.pm
index a0bf3c7d24..4522dce890 100644
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -105,6 +105,10 @@ sub pay {
         }
     );
 
+    Koha::Exceptions::Account::PaymentTypeRequired->throw()
+      if ( C4::Context->preference("RequirePaymentType")
+        && !defined($payment_type) );
+
     # NOTE: Pay historically always applied as much credit as it could to all
     # existing outstanding debits, whether passed specific debits or otherwise.
     if ( $payment->amountoutstanding ) {
diff --git a/Koha/Exceptions/Account.pm b/Koha/Exceptions/Account.pm
index e22d5ee521..26bbac593c 100644
--- a/Koha/Exceptions/Account.pm
+++ b/Koha/Exceptions/Account.pm
@@ -47,6 +47,10 @@ use Exception::Class (
     'Koha::Exceptions::Account::RegisterRequired' => {
         isa         => 'Koha::Exceptions::Account',
         description => 'Account transaction requires a cash register'
+    },
+    'Koha::Exceptions::Account::PaymentTypeRequired' => {
+        isa         => 'Koha::Exceptions::Account',
+        description => 'Account transaction requires a payment type'
     }
 );
 
diff --git a/t/db_dependent/Koha/Account.t b/t/db_dependent/Koha/Account.t
index 2f2fe9bf27..65c0246650 100755
--- a/t/db_dependent/Koha/Account.t
+++ b/t/db_dependent/Koha/Account.t
@@ -691,17 +691,31 @@ subtest 'reconcile_balance' => sub {
 
 subtest 'pay() tests' => sub {
 
-    plan tests => 6;
+    plan tests => 7;
 
     $schema->storage->txn_begin;
 
     # Disable renewing upon fine payment
     t::lib::Mocks::mock_preference( 'RenewAccruingItemWhenPaid', 0 );
 
+
     my $patron  = $builder->build_object({ class => 'Koha::Patrons' });
     my $library = $builder->build_object({ class => 'Koha::Libraries' });
     my $account = $patron->account;
 
+    t::lib::Mocks::mock_preference( 'RequirePaymentType', 1 );
+    throws_ok {
+        $account->pay(
+            {
+                amount       => 5,
+                interface    => 'intranet'
+            }
+        );
+    }
+    'Koha::Exceptions::Account::PaymentTypeRequired',
+      'Exception thrown for RequirePaymentType:1 + payment_type:undef';
+
+    t::lib::Mocks::mock_preference( 'RequirePaymentType', 0 );
     my $context = Test::MockModule->new('C4::Context');
     $context->mock( 'userenv', { branch => $library->id } );
 
@@ -714,7 +728,6 @@ subtest 'pay() tests' => sub {
     my $credit_2    = Koha::Account::Lines->find( $credit_2_id );
 
     is( $credit_2->branchcode, $library->id, 'branchcode set because library_id was passed' );
-
     # Enable cash registers
     t::lib::Mocks::mock_preference( 'UseCashRegisters', 1 );
     throws_ok {