diff --git a/apps/studio/next.config.js b/apps/studio/next.config.js
index 37c55f2be2..dceef89f31 100644
--- a/apps/studio/next.config.js
+++ b/apps/studio/next.config.js
@@ -531,8 +531,9 @@ const nextConfig = {
     pagesBufferLength: 100,
   },
   typescript: {
-    // Typechecking is run via GitHub Action only for efficiency.
-    ignoreBuildErrors: true,
+    // On previews, typechecking is run via GitHub Action only for efficiency
+    // On production, we turn it on to catch errors from typecheck due to conflicting PRs getting into prod
+    ignoreBuildErrors: process.env.NEXT_PUBLIC_VERCEL_ENV === 'production' ? false : true,
   },
   eslint: {
     // We are already running linting via GH action, this will skip linting during production build on Vercel