diff --git a/app/vminsert/main.go b/app/vminsert/main.go
index 20968aa8bf..378d500fc3 100644
--- a/app/vminsert/main.go
+++ b/app/vminsert/main.go
@@ -204,7 +204,7 @@ func requestHandler(w http.ResponseWriter, r *http.Request) bool {
 		// This is not our link.
 		return false
 	}
-	at, err := auth.NewToken(p.AuthToken)
+	at, err := auth.NewTokenPossibleMultitenant(p.AuthToken)
 	if err != nil {
 		httpserver.Errorf(w, r, "auth error: %s", err)
 		return true
diff --git a/app/vmselect/main.go b/app/vmselect/main.go
index 74c75cf3ae..956a297891 100644
--- a/app/vmselect/main.go
+++ b/app/vmselect/main.go
@@ -283,12 +283,6 @@ func requestHandler(w http.ResponseWriter, r *http.Request) bool {
 		httpserver.Errorf(w, r, "auth error: %s", err)
 		return true
 	}
-	if at == nil {
-		// the only option for at to be nil is when p.AuthToken == "multitenant"
-		// vmselect does not have multitenant endpoint, so request must be rejected
-		httpserver.Errorf(w, r, "auth error: tenantID must be specified explicitly in the request path")
-		return true
-	}
 	switch p.Prefix {
 	case "select":
 		return selectHandler(qt, startTime, w, r, p, at)