diff --git a/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js b/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js
index 7acdff18af1..fc88f123300 100644
--- a/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js
+++ b/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js
@@ -125,7 +125,7 @@ class CiVisibilityExporter extends AgentInfoExporter {
 
   getKnownTests (testConfiguration, callback) {
     if (!this.shouldRequestKnownTests()) {
-      return callback(null, undefined)
+      return callback(null)
     }
     this._canUseCiVisProtocolPromise.then((canUseCiVisProtocol) => {
       if (!canUseCiVisProtocol) {
@@ -199,6 +199,9 @@ class CiVisibilityExporter extends AgentInfoExporter {
 
   // Takes into account potential kill switches
   getConfiguration (remoteConfiguration) {
+    if (!remoteConfiguration) {
+      return {}
+    }
     const {
       isCodeCoverageEnabled,
       isSuitesSkippingEnabled,
diff --git a/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js b/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js
index 35a45c3d23c..8a0b943d261 100644
--- a/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js
+++ b/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js
@@ -169,7 +169,8 @@ describe('CI Visibility Exporter', () => {
             requireGit: false,
             isCodeCoverageEnabled: true,
             isItrEnabled: true,
-            isSuitesSkippingEnabled: true
+            isSuitesSkippingEnabled: true,
+            isEarlyFlakeDetectionEnabled: false
           })
           expect(err).not.to.exist
           expect(scope.isDone()).to.be.true