diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 3483efcaa18..992b5266b5b 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -142,7 +142,11 @@ if (!$rowid)
 	  }
   
     if (! empty($charge->payment_intent)) {
-    $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
+		if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+    		$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
+		} else {
+			$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
+		}
     }
 
 		// The metadata FULLTAG is defined by the online payment page