diff --git a/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php b/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php
index c09b82e4f..70e0bce02 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php
@@ -93,7 +93,7 @@ class SettingsListener
         if (! $this->settings->has('client_id') && $settings['client_id']) {
             $this->webhookRegistrar->register();
         }
-        if ($this->settings->has('client_id')) {
+        if ($this->settings->has('client_id') && $this->settings->get('client_id')) {
             $currentSecret = $this->settings->has('client_secret') ?
                 $this->settings->get('client_secret') : '';
             if (