diff --git a/includes/discovery/ucd-diskio.inc.php b/includes/discovery/ucd-diskio.inc.php
index 6d45fc213c..7e4735112e 100644
--- a/includes/discovery/ucd-diskio.inc.php
+++ b/includes/discovery/ucd-diskio.inc.php
@@ -7,7 +7,7 @@ if (is_array($diskio_array)) {
         if ($entry['diskIONRead'] > '0' || $entry['diskIONWritten'] > '0') {
             d_echo("$index ".$entry['diskIODevice']."\n");
 
-            if (dbFetchCell('SELECT COUNT(*) FROM `ucd_diskio` WHERE `device_id` = ? AND `diskio_index` = ?', array($device['device_id'], $index)) == '0') {
+            if (dbFetchCell('SELECT COUNT(*) FROM `ucd_diskio` WHERE `device_id` = ? AND `diskio_index` = ? and `diskio_descr` = ?', array($device['device_id'], $index, $entry['diskIODevice'])) == '0') {
                 $inserted = dbInsert(array('device_id' => $device['device_id'], 'diskio_index' => $index, 'diskio_descr' => $entry['diskIODevice']), 'ucd_diskio');
                 echo '+';
                 d_echo($sql." - $inserted inserted ");
@@ -16,7 +16,7 @@ if (is_array($diskio_array)) {
                   // FIXME Need update code here!
             }
 
-                $valid_diskio[$index] = 1;
+                $valid_diskio[$index] = $entry['diskIODevice'];
         } //end if
     } //end foreach
 } //end if
@@ -29,7 +29,7 @@ d_echo($valid_diskio);
 foreach (dbFetchRows($sql) as $test) {
     d_echo($test['diskio_index'].' -> '.$test['diskio_descr']."\n");
 
-    if (!$valid_diskio[$test['diskio_index']]) {
+    if ($valid_diskio[$test['diskio_index']] !== $test['diskio_descr']) {
         echo '-';
         dbDelete('ucd_diskio', '`diskio_id` = ?', array($test['diskio_id']));
     }