diff --git a/next.config.js b/next.config.js
index 93cd6b2713..38790f82f3 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,9 +1,12 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const withTM = require("next-transpile-modules")(["react-timezone-select"]);
 
-// TODO: Revisit this later with getStaticProps in App
-if (process.env.NEXTAUTH_URL) {
-  process.env.BASE_URL = process.env.NEXTAUTH_URL.replace("/api/auth", "");
+// So we can test deploy previews preview
+if (process.env.VERCEL_URL && !process.env.BASE_URL) {
+  process.env.BASE_URL = process.env.VERCEL_URL;
+}
+if (process.env.BASE_URL) {
+  process.env.NEXTAUTH_URL = process.env.BASE_URL + "/api/auth";
 }
 
 if (!process.env.EMAIL_FROM) {
@@ -13,9 +16,6 @@ if (!process.env.EMAIL_FROM) {
     "EMAIL_FROM environment variable is not set, this may indicate mailing is currently disabled. Please refer to the .env.example file."
   );
 }
-if (process.env.BASE_URL) {
-  process.env.NEXTAUTH_URL = process.env.BASE_URL + "/api/auth";
-}
 
 const validJson = (jsonString) => {
   try {