diff --git a/src/Http/Routing/src/EndpointRoutingMiddleware.cs b/src/Http/Routing/src/EndpointRoutingMiddleware.cs
index 65596ecfd4..cfaff0befb 100644
--- a/src/Http/Routing/src/EndpointRoutingMiddleware.cs
+++ b/src/Http/Routing/src/EndpointRoutingMiddleware.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Routing
             {
                 Log.MatchSkipped(_logger, endpoint);
 
-                // Someone else set the endpoint, we'll let them handle the clearing of the endpoint.
+                // Someone else set the endpoint, we'll let them handle the unsetting.
                 return _next(httpContext);
             }
 
@@ -88,6 +88,7 @@ namespace Microsoft.AspNetCore.Routing
 
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private async Task SetRoutingAndContinue(HttpContext httpContext)
         {
             // If there was no mutation of the endpoint then log failure
@@ -114,7 +115,8 @@ namespace Microsoft.AspNetCore.Routing
             }
             finally
             {
-                // This allows a second call in a single request (such as from the ErrorHandlerMiddleware) to perform routing again.
+                // We unset the endpoint after calling through to the next middleware. This enables any future calls into
+                // endpoint routing don't no-op from there already being an endpoint set.
                 httpContext.SetEndpoint(endpoint: null);
             }
         }
diff --git a/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs b/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs
index c3cf38cc32..b2e08d9a2c 100644
--- a/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs
+++ b/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs
@@ -20,48 +20,6 @@ namespace Microsoft.AspNetCore.Routing
 {
     public class EndpointRoutingMiddlewareTest
     {
-        [Fact]
-        public async Task Invoke_ChangedPath_ResultsInDifferentResult()
-        {
-            // Arrange
-            var httpContext = CreateHttpContext();
-            var matcher = new Mock<Matcher>();
-            var pathToEndpoints = new Dictionary<string, Endpoint>()
-            {
-                ["/initial"] = new Endpoint(c => Task.CompletedTask, new EndpointMetadataCollection(), "initialEndpoint"),
-                ["/changed"] = new Endpoint(c => Task.CompletedTask, new EndpointMetadataCollection(), "changedEndpoint")
-            };
-            matcher.Setup(m => m.MatchAsync(httpContext))
-                .Callback<HttpContext>(context =>
-                {
-                    var endpointToSet = pathToEndpoints[context.Request.Path];
-                    context.SetEndpoint(endpointToSet);
-                })
-                .Returns(Task.CompletedTask)
-                .Verifiable();
-            var matcherFactory = Mock.Of<MatcherFactory>(factory => factory.CreateMatcher(It.IsAny<EndpointDataSource>()) == matcher.Object);
-            var middleware = CreateMiddleware(
-                matcherFactory: matcherFactory,
-                next: context =>
-                {
-                    Assert.True(pathToEndpoints.TryGetValue(context.Request.Path, out var expectedEndpoint));
-
-                    var currentEndpoint = context.GetEndpoint();
-                    Assert.Equal(expectedEndpoint, currentEndpoint);
-
-                    return Task.CompletedTask;
-                });
-
-            // Act
-            httpContext.Request.Path = "/initial";
-            await middleware.Invoke(httpContext);
-            httpContext.Request.Path = "/changed";
-            await middleware.Invoke(httpContext);
-
-            // Assert
-            matcher.Verify();
-        }
-
         [Fact]
         public async Task Invoke_OnException_ResetsEndpoint()
         {