diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs
index f92723d8af..3d198f86cc 100644
--- a/src/Core/Services/Implementations/StripePaymentService.cs
+++ b/src/Core/Services/Implementations/StripePaymentService.cs
@@ -51,7 +51,7 @@ namespace Bit.Core.Services
             var stripePaymentMethod = paymentMethodType == PaymentMethodType.Card ||
                 paymentMethodType == PaymentMethodType.BankAccount;
 
-            if(stripePaymentMethod)
+            if(stripePaymentMethod && !string.IsNullOrWhiteSpace(paymentToken))
             {
                 if(paymentToken.StartsWith("pm_"))
                 {
@@ -334,7 +334,7 @@ namespace Bit.Core.Services
 
             string stipeCustomerPaymentMethodId = null;
             string stipeCustomerSourceToken = null;
-            if(stripePaymentMethod)
+            if(stripePaymentMethod && !string.IsNullOrWhiteSpace(paymentToken))
             {
                 if(paymentToken.StartsWith("pm_"))
                 {