diff --git a/plugins/azure/server/auth/azure.ts b/plugins/azure/server/auth/azure.ts
index ac7ddeb87d..5517dc6531 100644
--- a/plugins/azure/server/auth/azure.ts
+++ b/plugins/azure/server/auth/azure.ts
@@ -29,7 +29,8 @@ if (env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET) {
       clientID: env.AZURE_CLIENT_ID,
       clientSecret: env.AZURE_CLIENT_SECRET,
       callbackURL: `${env.URL}/auth/azure.callback`,
-      useCommonEndpoint: true,
+      useCommonEndpoint: env.AZURE_TENANT_ID ? false : true,
+      tenant: env.AZURE_TENANT_ID ? env.AZURE_TENANT_ID : undefined,
       passReqToCallback: true,
       resource: env.AZURE_RESOURCE_APP_ID,
       // @ts-expect-error StateStore
diff --git a/plugins/azure/server/env.ts b/plugins/azure/server/env.ts
index 03cc192a54..8f43743251 100644
--- a/plugins/azure/server/env.ts
+++ b/plugins/azure/server/env.ts
@@ -22,6 +22,10 @@ class AzurePluginEnvironment extends Environment {
   public AZURE_RESOURCE_APP_ID = this.toOptionalString(
     environment.AZURE_RESOURCE_APP_ID
   );
+
+  @IsOptional()
+  @CannotUseWithout("AZURE_CLIENT_ID")
+  public AZURE_TENANT_ID = this.toOptionalString(environment.AZURE_TENANT_ID);
 }
 
 export default new AzurePluginEnvironment();