diff --git a/src/NzbDrone.Common.Test/PathExtensionFixture.cs b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
index 344c6faf3..3fe72c058 100644
--- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
@@ -337,8 +337,17 @@ namespace NzbDrone.Common.Test
         [TestCase(@" C:\Test\TV\")]
         [TestCase(@" C:\Test\TV")]
 
-        public void IsPathValid_should_be_false(string path)
+        public void IsPathValid_should_be_false_on_windows(string path)
         {
+            WindowsOnly();
+            path.IsPathValid(PathValidationType.CurrentOs).Should().BeFalse();
+        }
+
+        [TestCase(@"")]
+        [TestCase(@"relative/path")]
+        public void IsPathValid_should_be_false_on_unix(string path)
+        {
+            PosixOnly();
             path.AsOsAgnostic().IsPathValid(PathValidationType.CurrentOs).Should().BeFalse();
         }
     }
diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs
index 4816c9f27..0a98cef4c 100644
--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -155,16 +155,20 @@ namespace NzbDrone.Common.Extensions
                 return false;
             }
 
-            var directoryInfo = new DirectoryInfo(path);
-
-            while (directoryInfo != null)
+            // Only check for leading or trailing spaces for path when running on Windows.
+            if (OsInfo.IsWindows)
             {
-                if (directoryInfo.Name.Trim() != directoryInfo.Name)
+                var directoryInfo = new DirectoryInfo(path);
+
+                while (directoryInfo != null)
                 {
-                    return false;
-                }
+                    if (directoryInfo.Name.Trim() != directoryInfo.Name)
+                    {
+                        return false;
+                    }
 
-                directoryInfo = directoryInfo.Parent;
+                    directoryInfo = directoryInfo.Parent;
+                }
             }
 
             if (validationType == PathValidationType.AnyOs)