diff --git a/api/routers/core_dynamic.py b/api/routers/core_dynamic.py
index b58fcce9d..79b9a6508 100644
--- a/api/routers/core_dynamic.py
+++ b/api/routers/core_dynamic.py
@@ -35,6 +35,8 @@ if not tenants.tenants_exists(use_pool=False):
     @public_app.put('/signup', tags=['signup'])
     def signup_handler(data: schemas.UserSignupSchema = Body(...)):
         content = signup.create_tenant(data)
+        if "errors" in content:
+            return content
         refresh_token = content.pop("refreshToken")
         refresh_token_max_age = content.pop("refreshTokenMaxAge")
         response = JSONResponse(content=content)
diff --git a/ee/api/routers/core_dynamic.py b/ee/api/routers/core_dynamic.py
index c40285c99..494ce8b31 100644
--- a/ee/api/routers/core_dynamic.py
+++ b/ee/api/routers/core_dynamic.py
@@ -40,6 +40,8 @@ if config("MULTI_TENANTS", cast=bool, default=False) or not tenants.tenants_exis
     @public_app.put('/signup', tags=['signup'])
     def signup_handler(data: schemas.UserSignupSchema = Body(...)):
         content = signup.create_tenant(data)
+        if "errors" in content:
+            return content
         refresh_token = content.pop("refreshToken")
         refresh_token_max_age = content.pop("refreshTokenMaxAge")
         response = JSONResponse(content=content)