diff --git a/app/Ninja/PaymentDrivers/BasePaymentDriver.php b/app/Ninja/PaymentDrivers/BasePaymentDriver.php
index 7fbd2666d14d..2fc47d4c6fab 100644
--- a/app/Ninja/PaymentDrivers/BasePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/BasePaymentDriver.php
@@ -540,16 +540,16 @@ class BasePaymentDriver
         $paymentMethod->setRelation('account_gateway_token', $customer);
         $paymentMethod = $this->creatingPaymentMethod($paymentMethod);
 
-        // archive the old payment method
-        $oldPaymentMethod = PaymentMethod::clientId($this->client()->id)
-            ->wherePaymentTypeId($paymentMethod->payment_type_id)
-            ->first();
-
-        if ($oldPaymentMethod) {
-            $oldPaymentMethod->delete();
-        }
-
         if ($paymentMethod) {
+            // archive the old payment method
+            $oldPaymentMethod = PaymentMethod::clientId($this->client()->id)
+                ->wherePaymentTypeId($paymentMethod->payment_type_id)
+                ->first();
+
+            if ($oldPaymentMethod) {
+                $oldPaymentMethod->delete();
+            }
+
             $paymentMethod->save();
         }