diff --git a/server/oauth/oauth.go b/server/oauth/oauth.go
index 2d4125287..b102a25e7 100644
--- a/server/oauth/oauth.go
+++ b/server/oauth/oauth.go
@@ -171,7 +171,7 @@ func InitOAuth() error {
 		microsoftClientSecret = ""
 	}
 	microsoftActiveDirTenantID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftActiveDirectoryTenantID)
-	if err != nil {
+	if err != nil || microsoftActiveDirTenantID == "" {
 		microsoftActiveDirTenantID = "common"
 	}
 	if microsoftClientID != "" && microsoftClientSecret != "" && microsoftActiveDirTenantID != "" {