diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js
index b94ab7d33d..95e8eccda1 100644
--- a/frontend/src/Settings/General/UpdateSettings.js
+++ b/frontend/src/Settings/General/UpdateSettings.js
@@ -76,6 +76,7 @@ function UpdateSettings(props) {
                 type={inputTypes.CHECK}
                 name="updateAutomatically"
                 helpText={translate('UpdateAutomaticallyHelpText')}
+                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker', { appName: 'Radarr' }) : undefined}
                 onChange={onInputChange}
                 {...updateAutomatically}
               />
diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js
index f2c78811df..1f53e1b74c 100644
--- a/frontend/src/System/Updates/Updates.js
+++ b/frontend/src/System/Updates/Updates.js
@@ -112,7 +112,6 @@ class Updates extends Component {
                   name={icons.CHECK_CIRCLE}
                   size={30}
                 />
-
                 <div className={styles.message}>
                   {translate('OnLatestVersion')}
                 </div>
@@ -151,7 +150,7 @@ class Updates extends Component {
 
                           {
                             update.branch === 'master' ?
-                              null:
+                              null :
                               <Label
                                 className={styles.label}
                               >
diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs
index 1ce4aef40f..e41cfb5d00 100644
--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -150,7 +150,7 @@ public static bool IsParentPath(this string parentPath, string childPath)
 
         public static bool IsPathValid(this string path, PathValidationType validationType)
         {
-            if (path.ContainsInvalidPathChars() || string.IsNullOrWhiteSpace(path))
+            if (string.IsNullOrWhiteSpace(path) || path.ContainsInvalidPathChars())
             {
                 return false;
             }
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 143b392b6e..e4d2511232 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -90,6 +90,7 @@
   "Automatic": "Automatic",
   "AutomaticAdd": "Automatic Add",
   "AutomaticSearch": "Automatic Search",
+  "AutomaticUpdatesDisabledDocker": "Automatic updates are not directly supported when using the Docker update mechanism. You will need to update the container image outside of {appName} or use a script",
   "AvailabilityDelay": "Availability Delay",
   "AvailabilityDelayHelpText": "Amount of time before or after available date to search for Movie",
   "Backup": "Backup",