diff --git a/api/routers/core.py b/api/routers/core.py
index a23e437ea..58819a811 100644
--- a/api/routers/core.py
+++ b/api/routers/core.py
@@ -663,12 +663,6 @@ async def mobile_signe(projectId: int, sessionId: int, data: schemas.MobileSignP
     return {"data": mobile.sign_keys(project_id=projectId, session_id=sessionId, keys=data.keys)}
 
 
-@public_app.post('/signup', tags=['signup'])
-@public_app.put('/signup', tags=['signup'])
-async def signup_handler(data: schemas.UserSignupSchema = Body(...)):
-    return signup.create_step1(data)
-
-
 @app.post('/projects', tags=['projects'])
 async def create_project(data: schemas.CreateProjectSchema = Body(...),
                          context: schemas.CurrentContext = Depends(OR_context)):
diff --git a/api/routers/core_dynamic.py b/api/routers/core_dynamic.py
index c6f71e88f..f4d5e9a62 100644
--- a/api/routers/core_dynamic.py
+++ b/api/routers/core_dynamic.py
@@ -6,7 +6,7 @@ from starlette.responses import RedirectResponse, FileResponse
 
 import schemas
 from chalicelib.core import sessions, errors, errors_viewed, errors_favorite, sessions_assignments, heatmaps, \
-    sessions_favorite, assist, sessions_notes, click_maps, sessions_replay
+    sessions_favorite, assist, sessions_notes, click_maps, sessions_replay, signup
 from chalicelib.core import sessions_viewed
 from chalicelib.core import tenants, users, projects, license
 from chalicelib.core import webhook
@@ -27,6 +27,13 @@ async def get_all_signup():
                      "edition": license.EDITION}}
 
 
+if not tenants.tenants_exists(use_pool=False):
+    @public_app.post('/signup', tags=['signup'])
+    @public_app.put('/signup', tags=['signup'])
+    async def signup_handler(data: schemas.UserSignupSchema = Body(...)):
+        return signup.create_step1(data)
+
+
 @app.get('/account', tags=['accounts'])
 async def get_account(context: schemas.CurrentContext = Depends(OR_context)):
     r = users.get(tenant_id=context.tenant_id, user_id=context.user_id)
diff --git a/ee/api/routers/core_dynamic.py b/ee/api/routers/core_dynamic.py
index 209fdbd6d..34c517ee8 100644
--- a/ee/api/routers/core_dynamic.py
+++ b/ee/api/routers/core_dynamic.py
@@ -7,7 +7,7 @@ from starlette.responses import RedirectResponse, FileResponse
 import schemas
 import schemas_ee
 from chalicelib.core import sessions, assist, heatmaps, sessions_favorite, sessions_assignments, errors, errors_viewed, \
-    errors_favorite, sessions_notes, click_maps, sessions_replay
+    errors_favorite, sessions_notes, click_maps, sessions_replay, signup
 from chalicelib.core import sessions_viewed
 from chalicelib.core import tenants, users, projects, license
 from chalicelib.core import webhook
@@ -31,6 +31,13 @@ async def get_all_signup():
                      "edition": license.EDITION}}
 
 
+if not tenants.tenants_exists(use_pool=False):
+    @public_app.post('/signup', tags=['signup'])
+    @public_app.put('/signup', tags=['signup'])
+    async def signup_handler(data: schemas.UserSignupSchema = Body(...)):
+        return signup.create_step1(data)
+
+
 @app.get('/account', tags=['accounts'])
 async def get_account(context: schemas.CurrentContext = Depends(OR_context)):
     r = users.get(tenant_id=context.tenant_id, user_id=context.user_id)