diff --git a/keep/api/config.py b/keep/api/config.py
index 5c4d86d9c..395f244b0 100644
--- a/keep/api/config.py
+++ b/keep/api/config.py
@@ -20,7 +20,10 @@ def on_starting(server=None):
         create_db_and_tables()
 
     # Create single tenant if it doesn't exist
-    if AUTH_TYPE == AuthenticationType.SINGLE_TENANT.value:
+    if AUTH_TYPE in [
+        AuthenticationType.SINGLE_TENANT.value,
+        AuthenticationType.NO_AUTH.value,
+    ]:
         try_create_single_tenant(SINGLE_TENANT_UUID)
 
     if os.environ.get("USE_NGROK", "false") == "true":