diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
index 3c249f5cab..bce22e8a77 100644
--- a/packages/server/src/api/controllers/dev.js
+++ b/packages/server/src/api/controllers/dev.js
@@ -141,7 +141,7 @@ exports.getBudibaseVersion = async ctx => {
 // TODO: remove as part of beta program
 exports.checkBetaAccess = async ctx => {
   // go to the cloud platform if running self hosted
-  if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
+  if ((env.ACCOUNT_PORTAL_URL && env.SELF_HOSTED) || !env.MULTI_TENANCY) {
     const baseUrl = env.ACCOUNT_PORTAL_URL.replace("account.", "")
     const response = await fetch(
       `${baseUrl}/api/beta/access?email=${ctx.query.email}`