diff --git a/server/src/main/java/com/defold/extender/log/ExtenderLogEnhancerConfiguration.java b/server/src/main/java/com/defold/extender/log/ExtenderLogEnhancerConfiguration.java
index 3017f91a..0550db88 100644
--- a/server/src/main/java/com/defold/extender/log/ExtenderLogEnhancerConfiguration.java
+++ b/server/src/main/java/com/defold/extender/log/ExtenderLogEnhancerConfiguration.java
@@ -1,6 +1,7 @@
 package com.defold.extender.log;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
@@ -8,6 +9,7 @@
 import com.google.cloud.spring.core.DefaultGcpProjectIdProvider;
 
 @Component
+@ConditionalOnProperty(name = "spring.cloud.gcp.logging.enabled", havingValue = "true")
 public class ExtenderLogEnhancerConfiguration {
     
     private String instanceName;