diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index c51539fe5..7ae58f104 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -112,9 +112,11 @@ static void cfi_fixup(flash_bank_t *bank, cfi_fixup_t *fixups)
 /* inline u32 flash_address(flash_bank_t *bank, int sector, u32 offset) */
 static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
 {
+	cfi_flash_bank_t *cfi_info = bank->driver_priv;
+
 	/* while the sector list isn't built, only accesses to sector 0 work */
 	if (sector == 0)
-		return bank->base + offset * bank->bus_width;
+		return bank->base + (offset * bank->bus_width << cfi_info->x16_as_x8 );
 	else
 	{
 		if (!bank->sectors)
@@ -122,7 +124,7 @@ static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
 			LOG_ERROR("BUG: sector list not yet built");
 			exit(-1);
 		}
-		return bank->base + bank->sectors[sector].offset + offset * bank->bus_width;
+		return bank->base + bank->sectors[sector].offset + (offset * bank->bus_width << cfi_info->x16_as_x8 );
 	}
 
 }