diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 54bce70ca..fb053f0e4 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -500,14 +500,6 @@ namespace Emby.Server.Implementations
             return new StreamHelper();
         }
 
-        public virtual bool SupportsAutoRunAtStartup
-        {
-            get
-            {
-                return EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows;
-            }
-        }
-
         /// <summary>
         /// Creates an instance of type and resolves all constructor dependancies
         /// </summary>
@@ -688,8 +680,6 @@ namespace Emby.Server.Implementations
         {
             Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false));
 
-            ConfigureAutorun();
-
             ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
 
             MediaEncoder.Init();
@@ -743,21 +733,6 @@ namespace Emby.Server.Implementations
             }
         }
 
-        /// <summary>
-        /// Configures the autorun.
-        /// </summary>
-        private void ConfigureAutorun()
-        {
-            try
-            {
-                ConfigureAutoRunAtStartup(ConfigurationManager.CommonConfiguration.RunAtStartup);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error configuring autorun");
-            }
-        }
-
         private IJsonSerializer CreateJsonSerializer()
         {
             return new JsonSerializer(FileSystemManager, LoggerFactory.CreateLogger("JsonSerializer"));
@@ -1567,8 +1542,6 @@ namespace Emby.Server.Implementations
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         protected void OnConfigurationUpdated(object sender, EventArgs e)
         {
-            ConfigureAutorun();
-
             var requiresRestart = false;
 
             // Don't do anything if these haven't been set yet
@@ -1919,7 +1892,6 @@ namespace Emby.Server.Implementations
                 CanLaunchWebBrowser = CanLaunchWebBrowser,
                 WanAddress = wanAddress,
                 HasUpdateAvailable = HasUpdateAvailable,
-                SupportsAutoRunAtStartup = SupportsAutoRunAtStartup,
                 TranscodingTempPath = ApplicationPaths.TranscodingTempPath,
                 ServerName = FriendlyName,
                 LocalAddress = localAddress,
@@ -2246,23 +2218,6 @@ namespace Emby.Server.Implementations
             OnApplicationUpdated(package);
         }
 
-        /// <summary>
-        /// Configures the automatic run at startup.
-        /// </summary>
-        /// <param name="autorun">if set to <c>true</c> [autorun].</param>
-        protected void ConfigureAutoRunAtStartup(bool autorun)
-        {
-            if (SupportsAutoRunAtStartup)
-            {
-                ConfigureAutoRunInternal(autorun);
-            }
-        }
-
-        protected virtual void ConfigureAutoRunInternal(bool autorun)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         /// This returns localhost in the case of no external dns, and the hostname if the 
         /// dns is prefixed with a valid Uri prefix.
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 830c160e3..4dc559031 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -24,12 +24,6 @@ namespace MediaBrowser.Controller
 
         Task<PublicSystemInfo> GetPublicSystemInfo(CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Gets a value indicating whether [supports automatic run at startup].
-        /// </summary>
-        /// <value><c>true</c> if [supports automatic run at startup]; otherwise, <c>false</c>.</value>
-        bool SupportsAutoRunAtStartup { get; }
-
         bool CanLaunchWebBrowser { get; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index f84735bed..08bf2379f 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -29,12 +29,6 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The log file retention days.</value>
         public int LogFileRetentionDays { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [run at startup].
-        /// </summary>
-        /// <value><c>true</c> if [run at startup]; otherwise, <c>false</c>.</value>
-        public bool RunAtStartup { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether this instance is first run.
         /// </summary>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 031222b75..a63ce5e66 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -118,12 +118,6 @@ namespace MediaBrowser.Model.System
         /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
         public bool HasUpdateAvailable { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [supports automatic run at startup].
-        /// </summary>
-        /// <value><c>true</c> if [supports automatic run at startup]; otherwise, <c>false</c>.</value>
-        public bool SupportsAutoRunAtStartup { get; set; }
-
         public string EncoderLocationType { get; set; }
 
         public Architecture SystemArchitecture { get; set; }