diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
index 3c249f5cab..45ff0c293a 100644
--- a/packages/server/src/api/controllers/dev.js
+++ b/packages/server/src/api/controllers/dev.js
@@ -142,7 +142,13 @@ exports.getBudibaseVersion = async ctx => {
 exports.checkBetaAccess = async ctx => {
   // go to the cloud platform if running self hosted
   if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
-    const baseUrl = env.ACCOUNT_PORTAL_URL.replace("account.", "")
+    let baseUrl = ""
+    if (env.ACCOUNT_PORTAL_URL) {
+      baseUrl = env.ACCOUNT_PORTAL_URL.replace("account.", "")
+    } else {
+      baseUrl = "https://budibase.app"
+    }
+
     const response = await fetch(
       `${baseUrl}/api/beta/access?email=${ctx.query.email}`
     )