diff --git a/src/disk/mo.c b/src/disk/mo.c
index fdcb30099..f73ec049f 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -1111,12 +1111,10 @@ mo_pre_execution_check(mo_t *dev, uint8_t *cdb)
 {
     int ready = 0;
 
-    if (dev->drv->bus_type == MO_BUS_SCSI) {
-        if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-            mo_log("MO %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", dev->id, ((dev->request_length >> 5) & 7));
-            mo_invalid_lun(dev);
-            return 0;
-        }
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
+        mo_log("MO %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", dev->id, ((dev->request_length >> 5) & 7));
+        mo_invalid_lun(dev);
+        return 0;
     }
 
     if (!(mo_command_flags[cdb[0]] & IMPLEMENTED)) {
diff --git a/src/disk/zip.c b/src/disk/zip.c
index 4c2492c1b..885aa92a5 100644
--- a/src/disk/zip.c
+++ b/src/disk/zip.c
@@ -1182,12 +1182,10 @@ zip_pre_execution_check(zip_t *dev, uint8_t *cdb)
 {
     int ready = 0;
 
-    if (dev->drv->bus_type == ZIP_BUS_SCSI) {
-        if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-            zip_log("ZIP %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", dev->id, ((dev->request_length >> 5) & 7));
-            zip_invalid_lun(dev);
-            return 0;
-        }
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
+        zip_log("ZIP %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", dev->id, ((dev->request_length >> 5) & 7));
+        zip_invalid_lun(dev);
+        return 0;
     }
 
     if (!(zip_command_flags[cdb[0]] & IMPLEMENTED)) {
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index 033a2bf42..b4b91cce8 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -1152,13 +1152,11 @@ scsi_cdrom_pre_execution_check(scsi_cdrom_t *dev, uint8_t *cdb)
 {
     int ready = 0;
 
-    if (dev->drv->bus_type == CDROM_BUS_SCSI) {
-        if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-            scsi_cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n",
-                           dev->id, ((dev->request_length >> 5) & 7));
-            scsi_cdrom_invalid_lun(dev);
-            return 0;
-        }
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
+        scsi_cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n",
+                       dev->id, ((dev->request_length >> 5) & 7));
+        scsi_cdrom_invalid_lun(dev);
+        return 0;
     }
 
     if (!(scsi_cdrom_command_flags[cdb[0]] & IMPLEMENTED)) {