diff --git a/src/Identity/Extensions.Core/src/IdentityBuilder.cs b/src/Identity/Extensions.Core/src/IdentityBuilder.cs
index df34d05d7fe5..ffd814b0cb5a 100644
--- a/src/Identity/Extensions.Core/src/IdentityBuilder.cs
+++ b/src/Identity/Extensions.Core/src/IdentityBuilder.cs
@@ -150,10 +150,9 @@ public virtual IdentityBuilder AddTokenProvider(string providerName, [Dynamicall
         Services.Configure<IdentityOptions>(options =>
         {
             // Overwrite ProviderType if it exists for backcompat, but keep a reference to the old one in case it's needed
-            // by a SignInManager with a different UserType. We'll continue to just overwrite ProviderInstance until someone asks for a fix though.
+            // by a SignInManager with a different UserType. Any pre-configured ProviderInstance is preserved.
             if (options.Tokens.ProviderMap.TryGetValue(providerName, out var descriptor))
             {
-                descriptor.ProviderInstance = null;
                 descriptor.AddProviderType(provider);
             }
             else
diff --git a/src/Identity/test/Identity.Test/UserManagerTest.cs b/src/Identity/test/Identity.Test/UserManagerTest.cs
index 6b17f105e0b7..12098d7eba49 100644
--- a/src/Identity/test/Identity.Test/UserManagerTest.cs
+++ b/src/Identity/test/Identity.Test/UserManagerTest.cs
@@ -1213,7 +1213,7 @@ public Task<IdentityResult> UpdateAsync(PocoUser user, CancellationToken cancell
         }
     }
 
-    [Fact(Skip = "This test fails, NotImplementedException isn't thrown: https://github.com/dotnet/aspnetcore/issues/57361")]
+    [Fact]
     public async Task UserManagerWillUseTokenProviderInstanceOverDefaults()
     {
         var provider = new ATokenProvider();