diff --git a/src/rockstor/storageadmin/views/disk.py b/src/rockstor/storageadmin/views/disk.py
index 71ff7d160..7ad2b479b 100644
--- a/src/rockstor/storageadmin/views/disk.py
+++ b/src/rockstor/storageadmin/views/disk.py
@@ -131,8 +131,10 @@ def _update_disk_state():
             # It makes no sense to save fake serial number drives between scans
             # as on each scan the serial number is re-generated (fake) anyway.
             # Serial numbers beginning with 'fake-serial-' are from scan_disks.
-            if (do.serial in serial_numbers_seen) or (
-                re.match("fake-serial-", do.serial) is not None
+            if (
+                (do.serial in serial_numbers_seen)
+                or (do.serial is None)
+                or (re.match("fake-serial-", do.serial) is not None)
             ):
                 logger.info(
                     "Deleting duplicate or fake (by serial) disk db "