diff --git a/okapi-core/src/main/java/org/folio/okapi/util/TenantValidator.java b/okapi-core/src/main/java/org/folio/okapi/util/TenantValidator.java
index 7b672246f..0a816646d 100644
--- a/okapi-core/src/main/java/org/folio/okapi/util/TenantValidator.java
+++ b/okapi-core/src/main/java/org/folio/okapi/util/TenantValidator.java
@@ -36,7 +36,7 @@ public static Future<Void> validate(String tenantId) {
       return Future.succeededFuture();
     }
 
-    String message = "11601";
+    String message;
 
     if (tenantId.contains("_")) {
       message = "11609";
@@ -46,6 +46,8 @@ public static Future<Void> validate(String tenantId) {
       message = "11611";
     } else if (STARTS_WITH_DIGIT.matcher(tenantId).matches()) {
       message = "11612";
+    } else {
+      message = "11601";
     }
 
     return Future.failedFuture(new OkapiError(ErrorType.USER,