diff --git a/Ombi.Core.Migration/Migrations/Version1100.cs b/Ombi.Core.Migration/Migrations/Version1100.cs
index 4c184ca22..52d5139fb 100644
--- a/Ombi.Core.Migration/Migrations/Version1100.cs
+++ b/Ombi.Core.Migration/Migrations/Version1100.cs
@@ -181,7 +181,7 @@ namespace Ombi.Core.Migration.Migrations
             try
             {
                 var settings = PlexSettings.GetSettings();
-                if (string.IsNullOrEmpty(settings.PlexAuthToken))
+                if (string.IsNullOrEmpty(settings.PlexAuthToken) || !settings.Enable)
                 {
                     return;
                 }
diff --git a/Ombi.Core.Migration/Migrations/Version195.cs b/Ombi.Core.Migration/Migrations/Version195.cs
index 3dee6a9e5..832490f90 100644
--- a/Ombi.Core.Migration/Migrations/Version195.cs
+++ b/Ombi.Core.Migration/Migrations/Version195.cs
@@ -62,6 +62,7 @@ namespace Ombi.Core.Migration.Migrations
         private void UpdateApplicationSettings()
         {
             var plex = PlexRequestSettings.GetSettings();
+            
             var jobSettings = Jobs.GetSettings();
             var newsLetter = NewsletterSettings.GetSettings();
 
diff --git a/Ombi.Core.Migration/Migrations/Version2200.cs b/Ombi.Core.Migration/Migrations/Version2200.cs
index 79939c8e3..de9f0d77e 100644
--- a/Ombi.Core.Migration/Migrations/Version2200.cs
+++ b/Ombi.Core.Migration/Migrations/Version2200.cs
@@ -68,8 +68,11 @@ namespace Ombi.Core.Migration.Migrations
         {
 #if !DEBUG
             var s = PlexSettings.GetSettings();
-            s.Enable = true;
-            PlexSettings.SaveSettings(s);
+            if (!string.IsNullOrEmpty(s.Ip))
+            {
+                s.Enable = true;
+                PlexSettings.SaveSettings(s);
+            }
 #endif
         }
         private void UpdateCustomSettings()