diff --git a/hw/nand.c b/hw/nand.c
index de3e502596f080de222bc055d6a042a3bea1cdeb..63620938fba0c4321c3dd94076a30cc60b6f560c 100644
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -297,6 +297,7 @@ static void nand_command(NANDFlashState *s)
         break;
 
     case NAND_CMD_BLOCKERASE2:
+        s->addr &= (1ull << s->addrlen * 8) - 1;
         if (nand_flash_ids[s->chip_id].options & NAND_SAMSUNG_LP)
             s->addr <<= 16;
         else