diff --git a/os/hal/lib/complex/serial_nor/hal_serial_nor.c b/os/hal/lib/complex/serial_nor/hal_serial_nor.c
index 82d90835e..05f02eb63 100644
--- a/os/hal/lib/complex/serial_nor/hal_serial_nor.c
+++ b/os/hal/lib/complex/serial_nor/hal_serial_nor.c
@@ -169,9 +169,6 @@ static flash_error_t snor_start_erase_all(void *instance) {
   /* Actual erase implementation.*/
   err = snor_device_start_erase_all(devp);
 
-  /* Ready state again.*/
-  devp->state = FLASH_READY;
-
   /* Bus released.*/
   bus_release(devp->config->busp);
 
diff --git a/readme.txt b/readme.txt
index a19030bf2..7061e3363 100644
--- a/readme.txt
+++ b/readme.txt
@@ -75,6 +75,7 @@
 
 *** 20.3.5 ***
 - FIX: Some MISRA-related fixes.
+- FIX: Fixed invalid state transition in SNOR flash driver (bug #1212).
 - FIX: Fixed missing check in chobjcaches.h (bug #1210).
 - FIX: Fixed RT testbuild application broken (bug #1208).
 - FIX: Fixed USB not enabled on STM32F103x6 (bug #1206).