diff --git a/src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRMarkerService.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRCoreMarkerService.cs
similarity index 83%
rename from src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRMarkerService.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRCoreMarkerService.cs
index 06720fe924..eb46a4d764 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRMarkerService.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRCoreMarkerService.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.AspNetCore.SignalR.Internal
 {
-    internal class SignalRMarkerService
+    internal class SignalRCoreMarkerService
     {
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs
index 2e8f076af8..58888470cf 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.SignalR
         /// <returns>The same instance of the <see cref="IConnectionBuilder"/> for chaining.</returns>
         public static IConnectionBuilder UseHub<THub>(this IConnectionBuilder connectionBuilder) where THub : Hub
         {
-            var marker = connectionBuilder.ApplicationServices.GetService(typeof(SignalRMarkerService));
+            var marker = connectionBuilder.ApplicationServices.GetService(typeof(SignalRCoreMarkerService));
             if (marker == null)
             {
                 throw new InvalidOperationException("Unable to find the required services. Please add all the required services by calling " +
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/SignalRDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRDependencyInjectionExtensions.cs
index 5240748836..3e5587cc5b 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/SignalRDependencyInjectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/SignalRDependencyInjectionExtensions.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Extensions.DependencyInjection
         /// <returns>An <see cref="ISignalRServerBuilder"/> that can be used to further configure the SignalR services.</returns>
         public static ISignalRServerBuilder AddSignalRCore(this IServiceCollection services)
         {
-            services.AddSingleton<SignalRMarkerService>();
+            services.AddSingleton<SignalRCoreMarkerService>();
             services.AddSingleton(typeof(HubLifetimeManager<>), typeof(DefaultHubLifetimeManager<>));
             services.AddSingleton(typeof(IHubProtocolResolver), typeof(DefaultHubProtocolResolver));
             services.AddSingleton(typeof(IHubContext<>), typeof(HubContext<>));
diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRAppBuilderExtensions.cs b/src/Microsoft.AspNetCore.SignalR/SignalRAppBuilderExtensions.cs
index c7f5afa84e..8a85de1a70 100644
--- a/src/Microsoft.AspNetCore.SignalR/SignalRAppBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.SignalR/SignalRAppBuilderExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -19,6 +20,13 @@ namespace Microsoft.AspNetCore.Builder
         /// <returns>The same instance of the <see cref="IApplicationBuilder"/> for chaining.</returns>
         public static IApplicationBuilder UseSignalR(this IApplicationBuilder app, Action<HubRouteBuilder> configure)
         {
+            var marker = app.ApplicationServices.GetService<SignalRMarkerService>();
+            if (marker == null)
+            {
+                throw new InvalidOperationException("Unable to find the required services. Please add all the required services by calling " +
+                                                    "'IServiceCollection.AddSignalR' inside the call to 'ConfigureServices(...)' in the application startup code.");
+            }
+
             app.UseConnections(routes =>
             {
                 configure(new HubRouteBuilder(routes));
diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
index a521bea32c..76fde233f5 100644
--- a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
@@ -35,6 +35,7 @@ namespace Microsoft.Extensions.DependencyInjection
         public static ISignalRServerBuilder AddSignalR(this IServiceCollection services)
         {
             services.AddConnections();
+            services.AddSingleton<SignalRMarkerService>();
             services.AddSingleton<IConfigureOptions<HubOptions>, HubOptionsSetup>();
             return services.AddSignalRCore();
         }
diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
index 3e28106832..5895333d8f 100644
--- a/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
+++ b/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -14,9 +15,9 @@ namespace Microsoft.AspNetCore.SignalR.Tests
         {
             var ex = Assert.Throws<NotSupportedException>(() =>
             {
-                using (var builder = BuildWebHost(routes => routes.MapHub<InvalidHub>("/overloads")))
+                using (var host = BuildWebHost(routes => routes.MapHub<InvalidHub>("/overloads")))
                 {
-                    builder.Start();
+                    host.Start();
                 }
             });
 
@@ -26,33 +27,44 @@ namespace Microsoft.AspNetCore.SignalR.Tests
         [Fact]
         public void NotAddingSignalRServiceThrows()
         {
-            var t = new WebHostBuilder()
-            .UseKestrel()
-            .Configure(app =>
-            {
-                var ex = Assert.Throws<InvalidOperationException>(() => {
-                    app.UseSignalR(routes =>
-                    {
-                        routes.MapHub<AuthHub>("/overloads");
+            var executedConfigure = false;
+            var builder = new WebHostBuilder();
+
+            builder
+                .UseKestrel()
+                .Configure(app =>
+                {
+                    executedConfigure = true;
+
+                    var ex = Assert.Throws<InvalidOperationException>(() => {
+                        app.UseSignalR(routes =>
+                        {
+                            routes.MapHub<AuthHub>("/overloads");
+                        });
                     });
+
+                    Assert.Equal("Unable to find the required services. Please add all the required services by calling " +
+                                 "'IServiceCollection.AddSignalR' inside the call to 'ConfigureServices(...)' in the application startup code.", ex.Message);
                 });
 
-                Assert.Equal("Unable to find the SignalR service. Please add it by calling 'IServiceCollection.AddSignalR()'.", ex.Message);
-            })
-            .Build();
+            using (var host = builder.Build())
+            {
+                host.Start();
+            }
 
+            Assert.True(executedConfigure);
         }
 
         [Fact]
         public void MapHubFindsAuthAttributeOnHub()
         {
             var authCount = 0;
-            using (var builder = BuildWebHost(routes => routes.MapHub<AuthHub>("/path", options =>
+            using (var host = BuildWebHost(routes => routes.MapHub<AuthHub>("/path", options =>
             {
                 authCount += options.AuthorizationData.Count;
             })))
             {
-                builder.Start();
+                host.Start();
             }
 
             Assert.Equal(1, authCount);
@@ -62,12 +74,12 @@ namespace Microsoft.AspNetCore.SignalR.Tests
         public void MapHubFindsAuthAttributeOnInheritedHub()
         {
             var authCount = 0;
-            using (var builder = BuildWebHost(routes => routes.MapHub<InheritedAuthHub>("/path", options =>
+            using (var host = BuildWebHost(routes => routes.MapHub<InheritedAuthHub>("/path", options =>
             {
                 authCount += options.AuthorizationData.Count;
             })))
             {
-                builder.Start();
+                host.Start();
             }
 
             Assert.Equal(1, authCount);
@@ -77,12 +89,12 @@ namespace Microsoft.AspNetCore.SignalR.Tests
         public void MapHubFindsMultipleAuthAttributesOnDoubleAuthHub()
         {
             var authCount = 0;
-            using (var builder = BuildWebHost(routes => routes.MapHub<DoubleAuthHub>("/path", options =>
+            using (var host = BuildWebHost(routes => routes.MapHub<DoubleAuthHub>("/path", options =>
             {
                 authCount += options.AuthorizationData.Count;
             })))
             {
-                builder.Start();
+                host.Start();
             }
 
             Assert.Equal(2, authCount);