diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index c68f228c12..df91c16e00 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -125,7 +125,12 @@ export default {
   requestFeedbackOnDeploy,
   submitFeedback,
   highlightFeedbackIcon,
-  disabled: ifAnalyticsEnabled(disabled),
+  disabled: () => {
+    if (analyticsEnabled == null) {
+      return true
+    }
+    return ifAnalyticsEnabled(disabled)
+  },
   optIn: ifAnalyticsEnabled(optIn),
   optOut: ifAnalyticsEnabled(optOut),
 }