diff --git a/dashboard/src/views/system.html b/dashboard/src/views/system.html
index ec97a2984..875bff69f 100644
--- a/dashboard/src/views/system.html
+++ b/dashboard/src/views/system.html
@@ -78,7 +78,7 @@
                 <div class="progress-bar" ng-repeat="content in disk.contents" style="width: {{ content.usage / disk.size * 100 }}%; background-color: {{ content.color }};" uib-tooltip="{{ content.label + ' ' + (content.usage | prettyDiskSize) }}"></div>
                 <div class="text-center text-muted" style="font-size: 12px; line-height: 20px;">{{ disk.available | prettyDiskSize }}</div>
               </div>
-              <div class="text-right text-muted" style="margin-top: 10px;">{{ 'system.diskUsage.diskSpeed' | tr:{ speed: disk.speed } }}</div>
+              <div class="text-right text-muted" style="margin-top: 10px;" ng-show="disk.speed !== -1">{{ 'system.diskUsage.diskSpeed' | tr:{ speed: disk.speed } }}</div>
               <p ng-hide="disk.volume">{{ 'system.diskUsage.diskContent' | tr }}:</p>
               <p ng-show="disk.volume" ng-bind-html="'system.diskUsage.volumeContent' | tr:{ name: disk.volume.name }"></p>
               <div ng-repeat="content in disk.contents" class="disk-content">
diff --git a/src/system.js b/src/system.js
index e7f563fac..cf666fb3a 100644
--- a/src/system.js
+++ b/src/system.js
@@ -214,10 +214,13 @@ async function updateDiskUsage(progressCallback) {
     for (const filesystem of filesystems) {
         const disk = disks[filesystem];
 
-        const [speedError, speed] = await safe(hdparm(filesystem));
-        if (speedError) progressCallback({ message: `hdparm error: ${speedError.message}`});
-
-        disk.speed = speed;
+        if (disk.type === 'ext4' || disk.type === 'xfs') {
+            const [speedError, speed] = await safe(hdparm(filesystem));
+            if (speedError) progressCallback({ message: `hdparm error: ${speedError.message}`});
+            disk.speed = speedError ? -1 : speed;
+        } else {
+            disk.speed = -1;
+        }
 
         percent += (100/filesystems.length);
         progressCallback({ percent, message: `Checking contents of ${filesystem}`});