diff --git a/api/commands.py b/api/commands.py
index 09548ac9f3..bf013cc77e 100644
--- a/api/commands.py
+++ b/api/commands.py
@@ -555,7 +555,8 @@ def create_tenant(email: str, language: Optional[str] = None, name: Optional[str
     if language not in languages:
         language = "en-US"
 
-    name = name.strip()
+    # Validates name encoding for non-Latin characters.
+    name = name.strip().encode("utf-8").decode("utf-8") if name else None
 
     # generate random password
     new_password = secrets.token_urlsafe(16)