diff --git a/src/freedombone-installer b/src/freedombone-installer
index 83a2ed5c21a1ec2e2336b132e3a5205ad8b3dfcb..ed0f3d91197ec5bb7392936fedd6fd4baa49f099 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1491,11 +1491,18 @@ function update_system_monitor {
     if [ -f "$system_monitor_file" ]; then
         rm "$system_monitor_file"
 
-        disk_use=$(df -h | grep /dev/sda1)
+        test_drive=/dev/sda1
+        if ! ls $test_drive; then
+            if ls /dev/mmcblk0p2; then
+                test_drive=/dev/mmcblk0p2
+            else
+                test_drive=
+            fi
+        fi
+
+        disk_use=$(df -h | grep $test_drive)
         disk_use_percent=0
-        if [[ "$disk_use" == *'/dev/sda1'* ]]; then
-            disk_use_percent=$(df -h | grep /dev/sda1 | awk -F ' ' '{print $5}')
-        else
+        if [[ "$disk_use" == *"$test_drive"* ]]; then
             disk_use_percent=$(df -h | grep /dev/mmcblk0p1 | awk -F ' ' '{print $5}')
         fi
 
@@ -1511,14 +1518,6 @@ function update_system_monitor {
             fi
         fi
 
-        test_drive=/dev/sda1
-        if ! ls $test_drive; then
-            if ls /dev/mmcblk0p2; then
-                test_drive=/dev/mmcblk0p2
-            else
-                test_drive=
-            fi
-        fi
         disk_io_speed=20
         disk_io_speed_percent=10
         if [ "$test_drive" ]; then
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 0e68d80f96f1c15b08ebe08813102ccc94202338..4ce36e8f22b1dcc2f71b3d0f19ca293f01da4525 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -740,11 +740,18 @@ function regenerate_webadmin_dynamic_dns {
 }
 
 function webadmin_update_system_monitor {
-    disk_use=$(df -h | grep /dev/sda1)
+    test_drive=/dev/sda1
+    if ! ls $test_drive; then
+        if ls /dev/mmcblk0p2; then
+            test_drive=/dev/mmcblk0p2
+        else
+            test_drive=
+        fi
+    fi
+
+    disk_use=$(df -h | grep $test_drive)
     disk_use_percent=0
-    if [[ "$disk_use" == *'/dev/sda1'* ]]; then
-        disk_use_percent=$(df -h | grep /dev/sda1 | awk -F ' ' '{print $5}')
-    else
+    if [[ "$disk_use" != *"$test_drive"* ]]; then
         disk_use_percent=$(df -h | grep /dev/mmcblk0p1 | awk -F ' ' '{print $5}')
     fi
 
@@ -760,14 +767,6 @@ function webadmin_update_system_monitor {
         fi
     fi
 
-    test_drive=/dev/sda1
-    if ! ls $test_drive; then
-        if ls /dev/mmcblk0p2; then
-            test_drive=/dev/mmcblk0p2
-        else
-            test_drive=
-        fi
-    fi
     disk_io_speed=20
     disk_io_speed_percent=10
     if [ "$test_drive" ]; then