diff --git a/backend/src/server/routes/v1/sso-router.ts b/backend/src/server/routes/v1/sso-router.ts
index 5f66a67ca..b6b3cb8aa 100644
--- a/backend/src/server/routes/v1/sso-router.ts
+++ b/backend/src/server/routes/v1/sso-router.ts
@@ -347,7 +347,7 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
       const serverCfg = await getServerCfg();
       return res.redirect(
         `${appCfg.SITE_URL}/signup/sso?token=${encodeURIComponent(req.passportUser.providerAuthToken)}${
-          serverCfg.defaultAuthOrgId ? `&defaultOrgAllowed=true` : ""
+          serverCfg.defaultAuthOrgId && !appCfg.isCloud ? `&defaultOrgAllowed=true` : ""
         }`
       );
     }
diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts
index 14663ced6..14aa8f038 100644
--- a/backend/src/services/auth/auth-login-service.ts
+++ b/backend/src/services/auth/auth-login-service.ts
@@ -724,7 +724,7 @@ export const authLoginServiceFactory = ({
         isGhost: false
       });
 
-      if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId) {
+      if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId && !appCfg.isCloud) {
         let orgId = "";
         const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId);
         if (!defaultOrg) {
diff --git a/backend/src/services/auth/auth-signup-service.ts b/backend/src/services/auth/auth-signup-service.ts
index f3205bc3a..4d8c98205 100644
--- a/backend/src/services/auth/auth-signup-service.ts
+++ b/backend/src/services/auth/auth-signup-service.ts
@@ -295,7 +295,7 @@ export const authSignupServiceFactory = ({
 
     if (!organizationId) {
       let orgId = "";
-      if (useDefaultOrg && serverCfg.defaultAuthOrgId) {
+      if (useDefaultOrg && serverCfg.defaultAuthOrgId && !appCfg.isCloud) {
         const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId);
         if (!defaultOrg) throw new BadRequestError({ message: "Failed to find default organization" });
         orgId = defaultOrg.id;