diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index 8761d463c6..60a41e42c2 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -3,6 +3,8 @@ import posthog from "posthog-js"
 import api from "builderStore/api"
 
 let analyticsEnabled
+const posthogConfigured = process.env.POSTHOG_TOKEN && process.env.POSTHOG_URL
+const sentryConfigured = process.env.SENTRY_DSN
 
 async function activate() {
   if (analyticsEnabled === undefined) {
@@ -13,21 +15,22 @@ async function activate() {
     analyticsEnabled = (await response.json()) === true
   }
   if (!analyticsEnabled) return
-  Sentry.init({ dsn: process.env.SENTRY_DSN })
-  if (!process.env.POSTHOG_TOKEN) return
-  posthog.init(process.env.POSTHOG_TOKEN, {
-    api_host: process.env.POSTHOG_URL,
-  })
-  posthog.set_config({ persistence: "cookie" })
+  if (sentryConfigured) Sentry.init({ dsn: process.env.SENTRY_DSN })
+  if (posthogConfigured) {
+    posthog.init(process.env.POSTHOG_TOKEN, {
+      api_host: process.env.POSTHOG_URL,
+    })
+    posthog.set_config({ persistence: "cookie" })
+  }
 }
 
 function identify(id) {
-  if (!analyticsEnabled) return
-  if (!id) return
-  posthog.identify(id)
-  Sentry.configureScope(scope => {
-    scope.setUser({ id: id })
-  })
+  if (!analyticsEnabled || !id) return
+  if (posthogConfigured) posthog.identify(id)
+  if (sentryConfigured)
+    Sentry.configureScope(scope => {
+      scope.setUser({ id: id })
+    })
 }
 
 async function identifyByApiKey(apiKey) {
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index d0c471d30e..58beb4bbec 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -37,7 +37,9 @@
     if (keys.userId) {
       hasKey = true
       analytics.identify(keys.userId)
-    } else {
+    }
+
+    if (!keys.budibase) {
       showCreateAppModal()
     }
   }