diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 2784620bea..80eabb82d4 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -6,7 +6,7 @@
   <ItemGroup Label="Versions for direct package references">
     <PackageVersion Include="Autofac" Version="9.0.0" />
     <PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.7" />
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.19.0" />
     <PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
     <PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
     <PackageVersion Include="ByteSize" Version="2.1.2" />
diff --git a/src/ServiceControl.Transports.ASBS/TokenCredentialAuthentication.cs b/src/ServiceControl.Transports.ASBS/TokenCredentialAuthentication.cs
index a11f74463f..d00e277891 100644
--- a/src/ServiceControl.Transports.ASBS/TokenCredentialAuthentication.cs
+++ b/src/ServiceControl.Transports.ASBS/TokenCredentialAuthentication.cs
@@ -1,4 +1,5 @@
-namespace ServiceControl.Transports.ASBS
+#nullable enable
+namespace ServiceControl.Transports.ASBS
 {
     using Azure.Core;
     using Azure.Identity;
@@ -13,21 +14,20 @@ public TokenCredentialAuthentication(string fullyQualifiedNamespace)
             Credential = new DefaultAzureCredential();
         }
 
-        public TokenCredentialAuthentication(string fullyQualifiedNamespace, string clientId)
+        public TokenCredentialAuthentication(string fullyQualifiedNamespace, string? clientId)
         {
             FullyQualifiedNamespace = fullyQualifiedNamespace;
             ClientId = clientId;
-            Credential = new ManagedIdentityCredential(clientId);
+            Credential = new ManagedIdentityCredential(clientId is not null ? ManagedIdentityId.FromUserAssignedClientId(clientId) : ManagedIdentityId.SystemAssigned);
         }
 
         public string FullyQualifiedNamespace { get; }
 
         public TokenCredential Credential { get; }
 
-        public string ClientId { get; }
+        public string? ClientId { get; }
 
-        public override ServiceBusAdministrationClient BuildManagementClient()
-            => new ServiceBusAdministrationClient(FullyQualifiedNamespace, Credential);
+        public override ServiceBusAdministrationClient BuildManagementClient() => new(FullyQualifiedNamespace, Credential);
 
         public override AzureServiceBusTransport CreateTransportDefinition(ConnectionSettings connectionSettings, TopicTopology topology)
         {