diff --git a/samples/Sample06/Startup.cs b/samples/Sample06/Startup.cs
index bc59cae65..6d7b93b0c 100644
--- a/samples/Sample06/Startup.cs
+++ b/samples/Sample06/Startup.cs
@@ -1,6 +1,7 @@
 using Elsa.Activities.Http.Extensions;
 using Elsa.Extensions;
 using Elsa.Persistence.Memory;
+using Elsa.Runtime;
 using Elsa.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -22,6 +23,7 @@ namespace Sample06
         {
             services
                 .AddWorkflows()
+                .AddTaskExecutingServer()
                 .AddHttpActivities();
         }
 
diff --git a/samples/Sample07/Startup.cs b/samples/Sample07/Startup.cs
index 5a8e33d77..e218ac715 100644
--- a/samples/Sample07/Startup.cs
+++ b/samples/Sample07/Startup.cs
@@ -3,6 +3,7 @@ using Elsa.Activities.Http.Extensions;
 using Elsa.Activities.Timers.Extensions;
 using Elsa.Extensions;
 using Elsa.Persistence.Memory;
+using Elsa.Runtime;
 using Elsa.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -24,6 +25,7 @@ namespace Sample07
         {
             services
                 .AddWorkflows()
+                .AddTaskExecutingServer()
                 .AddHttpActivities(options => options.Bind(Configuration.GetSection("Http")))
                 .AddEmailActivities(options => options.Bind(Configuration.GetSection("Smtp")))
                 .AddTimerActivities(options => options.Bind(Configuration.GetSection("BackgroundRunner")))
diff --git a/samples/Sample08/Startup.cs b/samples/Sample08/Startup.cs
index 19156d8d2..7af101a7c 100644
--- a/samples/Sample08/Startup.cs
+++ b/samples/Sample08/Startup.cs
@@ -4,6 +4,7 @@ using Elsa.Activities.MassTransit.Extensions;
 using Elsa.Activities.Timers.Extensions;
 using Elsa.Extensions;
 using Elsa.Persistence.Memory;
+using Elsa.Runtime;
 using Elsa.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -29,6 +30,7 @@ namespace Sample08
         {
             services
                 .AddWorkflows()
+                .AddTaskExecutingServer()
                 .AddHttpActivities()
                 .AddTimerActivities(options => options.Configure(x => x.SweepInterval = Period.FromSeconds(10)))
                 .AddEmailActivities(options => options.Bind(Configuration.GetSection("Smtp")))
diff --git a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs
index 261286705..f8d79aa3f 100644
--- a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs
+++ b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs
@@ -33,7 +33,6 @@ namespace Elsa.Activities.Http.Extensions
                 .AddActivity<HttpRequestAction>();
 
             services
-                .AddTaskExecutingServer()
                 .AddSingleton<ITokenService, TokenService>()
                 .AddSingleton<IContentFormatter, DefaultContentFormatter>()
                 .AddSingleton<IContentFormatter, JsonContentFormatter>()
diff --git a/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs b/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs
index 9f71ef86a..9fc629bac 100644
--- a/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs
@@ -19,6 +19,9 @@ namespace Elsa.Runtime
                 .AddTransient<IStartupTask, TStartupTask>();
         }
 
+        /// <summary>
+        /// Registers a TaskExecutingServer that automatically invokes <see cref="IStartupRunner"/> when Kestrel starts.
+        /// </summary>
         public static IServiceCollection AddTaskExecutingServer(this IServiceCollection services)
         {
             return services