diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
index 5477d80ba1..df6f4d2a48 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
@@ -301,6 +301,7 @@ nvme_disk_init_device(void* _info, void** _cookie)
 
 	uint8 irq = info->info.u.h0.interrupt_line;
 	if (sPCIx86Module != NULL) {
+#if 0
 		if (sPCIx86Module->get_msix_count(info->info.bus, info->info.device,
 				info->info.function)) {
 			uint8 msixVector = 0;
@@ -311,7 +312,9 @@ nvme_disk_init_device(void* _info, void** _cookie)
 				TRACE_ALWAYS("using MSI-X\n");
 				irq = msixVector;
 			}
-		} else if (sPCIx86Module->get_msi_count(info->info.bus,
+		} else
+#endif
+		if (sPCIx86Module->get_msi_count(info->info.bus,
 				info->info.device, info->info.function) >= 1) {
 			uint8 msiVector = 0;
 			if (sPCIx86Module->configure_msi(info->info.bus, info->info.device,