diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index b0f37eeef..21731a3a6 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -970,6 +970,10 @@ namespace MediaBrowser.Server.Startup.Common
         {
             get
             {
+				if (!ServerConfigurationManager.Configuration.EnableAutoUpdate) 
+				{
+					return false;
+				}
 #if DEBUG
                 return false;
 #endif