diff --git a/Model/Adminhtml/Backend/ChangeApiMode.php b/Model/Adminhtml/Backend/ChangeApiMode.php
index 7e632bf6229..82fc07e740f 100644
--- a/Model/Adminhtml/Backend/ChangeApiMode.php
+++ b/Model/Adminhtml/Backend/ChangeApiMode.php
@@ -69,7 +69,9 @@ public function beforeSave(): self
     public function afterSave()
     {
         $apiKey = $this->getApiKey($this->getValue());
-        $this->updateProfileId->execute($apiKey, $this->getScope(), $this->getScopeId());
+        if ($apiKey) {
+            $this->updateProfileId->execute($apiKey, $this->getScope(), $this->getScopeId());
+        }
 
         return parent::afterSave();
     }
diff --git a/composer.json b/composer.json
index 06c364e255e..b4b61e1386a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mollie/magento2",
   "description": "Mollie Payment Module for Magento 2",
-  "version": "2.35.0",
+  "version": "2.35.1",
   "keywords": [
     "mollie",
     "payment",
diff --git a/etc/config.xml b/etc/config.xml
index 7fc0bffaf62..32a5b285514 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -3,7 +3,7 @@
     <default>
         <payment>
             <mollie_general>
-                <version>v2.35.0</version>
+                <version>v2.35.1</version>
                 <active>0</active>
                 <enabled>0</enabled>
                 <type>test</type>