diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 177bdbe14ac4..44bbd40006ba 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -132,6 +132,10 @@ class AccountGatewayController extends BaseController
         $currentGateways = $account->account_gateways;
         $gateways = Gateway::where('payment_library_id', '=', 1)->orderBy('name')->get();
 
+        if ($accountGateway) {
+            $accountGateway->fields = [];
+        }
+
         foreach ($gateways as $gateway) {
             $fields = $gateway->getFields();
             if (! $gateway->isCustom()) {