diff --git a/bundle/mvn/camunda-saas-bundle/src/main/java/io/camunda/connector/runtime/SaaSOperateClientFactory.java b/bundle/mvn/camunda-saas-bundle/src/main/java/io/camunda/connector/runtime/SaaSOperateClientFactory.java
index 37a525c7ca..e75fd846de 100644
--- a/bundle/mvn/camunda-saas-bundle/src/main/java/io/camunda/connector/runtime/SaaSOperateClientFactory.java
+++ b/bundle/mvn/camunda-saas-bundle/src/main/java/io/camunda/connector/runtime/SaaSOperateClientFactory.java
@@ -24,14 +24,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 
 @Configuration
 @Primary
-@ConditionalOnProperty(value = "operate.client.enabled", havingValue = "true")
+@Profile("!dev")
+@EnableConfigurationProperties(OperateClientConfigurationProperties.class)
 public class SaaSOperateClientFactory {
 
   private static final Logger LOG = LoggerFactory.getLogger(SaaSOperateClientFactory.class);
diff --git a/bundle/mvn/camunda-saas-bundle/src/main/resources/application.properties b/bundle/mvn/camunda-saas-bundle/src/main/resources/application.properties
index 1adb0a9853..1a60c2dc68 100644
--- a/bundle/mvn/camunda-saas-bundle/src/main/resources/application.properties
+++ b/bundle/mvn/camunda-saas-bundle/src/main/resources/application.properties
@@ -17,5 +17,5 @@ camunda.connector.auth.issuer=https://weblogin.cloud.dev.ultrawombat.com/
 # Enforce local connection, even if cluster-id set (for Operate Auth)
 zeebe.client.connection-mode=ADDRESS
 
-# Enable operate client and secret provider initialization
-operate.client.enabled=true
\ No newline at end of file
+# Enable operate client and secret provider initialization. Must be disabled (set to false) to avoid creating the default operate client bean.
+operate.client.enabled=false
\ No newline at end of file