diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
index e52a65708..62f46e2bd 100644
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -323,6 +323,20 @@ namespace NzbDrone.Core.Configuration
             }
         }
 
+        public void MigrateConfigFile()
+        {
+            if (!File.Exists(_configFile))
+            {
+                return;
+            }
+
+            // If SSL is enabled and a cert hash is still in the config file disable SSL
+            if (EnableSsl && GetValue("SslCertHash", null).IsNotNullOrWhiteSpace())
+            {
+                SetValue("EnableSsl", false);
+            }
+        }
+
         private void DeleteOldValues()
         {
             var xDoc = LoadConfigFile();
@@ -394,6 +408,7 @@ namespace NzbDrone.Core.Configuration
 
         public void HandleAsync(ApplicationStartedEvent message)
         {
+            MigrateConfigFile();
             EnsureDefaultConfigFile();
             DeleteOldValues();
         }