diff --git a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
index f91a90ac2..0953f6b59 100644
--- a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
@@ -133,6 +133,7 @@ namespace NzbDrone.Core.Test.DiskSpace
 
         [TestCase("/boot")]
         [TestCase("/var/lib/rancher")]
+        [TestCase("/var/lib/rancher/volumes")]
         [TestCase("/var/lib/kubelet")]
         [TestCase("/var/lib/docker")]
         [TestCase("/some/place/docker/aufs")]
diff --git a/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs b/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs
index 4f3d8f0ba..76a8c0a73 100644
--- a/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs
+++ b/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.DiskSpace
         private readonly IDiskProvider _diskProvider;
         private readonly Logger _logger;
 
-        private static readonly Regex _regexSpecialDrive = new Regex("^/var/lib/(docker|rancher|kubelet)$|^/boot$|docker(/var)?/aufs", RegexOptions.Compiled);
+        private static readonly Regex _regexSpecialDrive = new Regex("^/var/lib/(docker|rancher|kubelet)(/|$)|^/boot(/|$)|/docker(/var)?/aufs(/|$)", RegexOptions.Compiled);
 
         public DiskSpaceService(ISeriesService seriesService, IConfigService configService, IDiskProvider diskProvider, Logger logger)
         {
diff --git a/src/UI/System/Info/DiskSpace/DiskSpacePathCell.js b/src/UI/System/Info/DiskSpace/DiskSpacePathCell.js
index de2ceb9b6..56cbee2c7 100644
--- a/src/UI/System/Info/DiskSpace/DiskSpacePathCell.js
+++ b/src/UI/System/Info/DiskSpace/DiskSpacePathCell.js
@@ -11,7 +11,7 @@ module.exports = Backgrid.Cell.extend({
 
         var contents = path;
 
-        if (label) {
+        if (label && label !== path && !label.startsWith("UUID=")) {
             contents += ' ({0})'.format(label);
         }