diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php b/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
index aed294bb7..a18f36764 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
@@ -193,7 +193,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 */
 	public function needs_setup(): bool {
 
-		return true;
+		return ! $this->onboarded;
 	}
 
 	/**