diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h b/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
index 9acb36acac..63cd296384 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
@@ -260,8 +260,8 @@ extern scsi_for_sim_interface *gSCSI;
 #define MAX_SECTOR_LBA_48 ((1ull << 48) - 1)
 
 
-#define LO32(val) ((uint32)(val))
-#define HI32(val) (((uint64)(val)) >> 32)
+#define LO32(val) ((uint32)(addr_t)(val))
+#define HI32(val) ((uint32)(((uint64)(addr_t)(val)) >> 32))
 #define ASSERT(expr) if (expr) {} else panic(#expr)
 
 #define PCI_VENDOR_INTEL	0x8086