diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 45b1f0e3ff..0d261bdb8b 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -145,8 +145,9 @@ namespace MediaBrowser.Common.Implementations
             Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false));
 
             Resolve<IHttpServer>().Init(GetExports<IRestfulService>(false));
+            Resolve<IServerManager>().AddWebSocketListeners(GetExports<IWebSocketListener>(false));
 
-            Resolve<IServerManager>().AddWebSocketListeners(GetExports<IWebSocketListener>());
+            Resolve<IServerManager>().Start();
         }
         
         /// <summary>
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 68983064e4..6183c28396 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -231,7 +231,6 @@ namespace MediaBrowser.Common.Kernel
             await OnComposablePartsLoaded().ConfigureAwait(false);
 
             ServerManager = ApplicationHost.Resolve<IServerManager>();
-            ServerManager.Start();
         }
 
         /// <summary>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index f4b110b399..8205018ab7 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -127,17 +127,6 @@ namespace MediaBrowser.ServerApplication
             RegisterSingleInstance(ServerFactory.CreateServer(this, ProtobufSerializer, Logger, "Media Browser", "index.html"), false);
         }
 
-        /// <summary>
-        /// Finds the parts.
-        /// </summary>
-        protected override void FindParts()
-        {
-            Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false));
-
-            Resolve<IHttpServer>().Init(GetExports<IRestfulService>(false));
-            Resolve<IServerManager>().AddWebSocketListeners(GetExports<IWebSocketListener>(false));
-        }
-
         /// <summary>
         /// Restarts this instance.
         /// </summary>