diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
index 4b7543d5f..086cdac0f 100644
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -141,7 +141,21 @@ namespace NzbDrone.Core.Configuration
 
         public bool LaunchBrowser => GetValueBoolean("LaunchBrowser", true);
 
-        public string ApiKey => GetValue("ApiKey", GenerateApiKey());
+        public string ApiKey
+        {
+            get
+            {
+                var apiKey = GetValue("ApiKey", GenerateApiKey());
+
+                if (apiKey.IsNullOrWhiteSpace())
+                {
+                    apiKey = GenerateApiKey();
+                    SetValue("ApiKey", apiKey);
+                }
+
+                return apiKey;
+            }
+        }
 
         public AuthenticationType AuthenticationMethod
         {