diff --git a/src/ec/google/chromeec/ec_mec.c b/src/ec/google/chromeec/ec_mec.c
index 8a3b852..5d1ec3c 100644
--- a/src/ec/google/chromeec/ec_mec.c
+++ b/src/ec/google/chromeec/ec_mec.c
@@ -85,7 +85,7 @@
 	 * Long access cannot be used on misaligned data since reading B0 loads
 	 * the data register and writing B3 flushes it.
 	 */
-	if (port & 0x3)
+	if ((port & 0x3) || (length < 4))
 		access_mode = ACCESS_TYPE_BYTE;
 	else
 		access_mode = ACCESS_TYPE_LONG_AUTO_INCREMENT;