diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
index 62e5a845dd0..4e5d7ad1581 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -1121,6 +1121,14 @@ && isExplicitlyDisabled(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED
         && isExplicitlyDisabled(DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED)) {
       return;
     }
+    if (ciVisibilityEnabled
+        && !dynamicInstrumentationEnabled
+        && !exceptionReplayEnabled
+        && !codeOriginEnabled
+        && !distributedDebuggerEnabled) {
+      // if CI Visibility is enabled, debugger should be disabled by default
+      return;
+    }
     if (!remoteConfigEnabled) {
       log.warn("Cannot enable Dynamic Instrumentation because Remote Configuration is not enabled");
       return;