diff --git a/packages/cli/src/commands/experimental/setupSentryHandler.js b/packages/cli/src/commands/experimental/setupSentryHandler.js
index 6af702e5d4eb..dcff86f2b54e 100644
--- a/packages/cli/src/commands/experimental/setupSentryHandler.js
+++ b/packages/cli/src/commands/experimental/setupSentryHandler.js
@@ -30,7 +30,7 @@ export const handler = async ({ force }) => {
     addWebPackages(['@sentry/react@7', '@sentry/browser@7']),
     addEnvVarTask(
       'SENTRY_DSN',
-      'https://XXXXXXX@XXXXXXX.ingest.sentry.io/XXXXXXX',
+      '',
       'https://docs.sentry.io/product/sentry-basics/dsn-explainer/'
     ),
     {
diff --git a/packages/cli/src/commands/experimental/templates/sentryApi.ts.template b/packages/cli/src/commands/experimental/templates/sentryApi.ts.template
index 2df7623b96a0..dcb781fcb611 100644
--- a/packages/cli/src/commands/experimental/templates/sentryApi.ts.template
+++ b/packages/cli/src/commands/experimental/templates/sentryApi.ts.template
@@ -5,7 +5,10 @@ import { db as client } from 'src/lib/db'
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   environment: process.env.NODE_ENV,
-  integrations: [new Sentry.Integrations.Prisma({ client })],
+  integrations: [
+    new Sentry.Integrations.Prisma({ client }),
+    new Sentry.Integrations.Http({ tracing: true }),
+  ],
   tracesSampleRate: 1.0,
 })
 
diff --git a/packages/cli/src/commands/experimental/templates/sentryWeb.ts.template b/packages/cli/src/commands/experimental/templates/sentryWeb.ts.template
index 309e43f0a9f7..1bf3051a226e 100644
--- a/packages/cli/src/commands/experimental/templates/sentryWeb.ts.template
+++ b/packages/cli/src/commands/experimental/templates/sentryWeb.ts.template
@@ -1,8 +1,29 @@
 import * as Sentry from '@sentry/react'
 
+let dsn = ''
+let environment = 'development'
+
+if (typeof process === 'undefined' || !process.env?.SENTRY_DSN) {
+  console.error(
+    'Missing SENTRY_DSN environment variable. Did you forget to add it to ' +
+      'your redwood.toml file in `includeEnvironmentVariables`?'
+  )
+  console.info(`Copy this into your redwood.toml file:`)
+  console.info(`
+  includeEnvironmentVariables = [
+    "SENTRY_DSN"
+  ]
+
+  `)
+  console.error('Sentry is disabled for now')
+} else {
+  dsn = process.env.SENTRY_DSN
+  environment = process.env.NODE_ENV
+}
+
 Sentry.init({
-  dsn: process.env.SENTRY_DSN,
-  environment: process.env.NODE_ENV,
+  dsn,
+  environment,
   integrations: [new Sentry.BrowserTracing()],
   tracesSampleRate: 1.0,
 })