diff --git a/drivers/usb/usbstor/disk.c b/drivers/usb/usbstor/disk.c
index 0333e9e98c2..0f426c8e26b 100644
--- a/drivers/usb/usbstor/disk.c
+++ b/drivers/usb/usbstor/disk.c
@@ -639,7 +639,10 @@ USBSTOR_HandleDeviceControl(
         RtlZeroMemory(ScsiInquiryData, sizeof(INQUIRYDATA));
         ScsiInquiryData->DeviceType = UFIInquiryResponse->DeviceType;
         ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F);
-        ScsiInquiryData->RemovableMedia = FALSE; //HACK for IoReadPartitionTable
+
+        /* Hack for IoReadPartitionTable call in disk.sys */
+        ScsiInquiryData->RemovableMedia = (ScsiInquiryData->DeviceType != DIRECT_ACCESS_DEVICE) ? 1 : 0;
+
         ScsiInquiryData->Versions = 0x04;
         ScsiInquiryData->ResponseDataFormat = 0x02;
         ScsiInquiryData->AdditionalLength = 31;