diff --git a/src/mainboard/google/storm/mmu.c b/src/mainboard/google/storm/mmu.c
index 47e3b09789..4d2e9a0123 100644
--- a/src/mainboard/google/storm/mmu.c
+++ b/src/mainboard/google/storm/mmu.c
@@ -51,8 +51,6 @@ void setup_mmu(enum dram_state dram)
 	/* Map Device memory. */
 	mmu_config_range_kb(RPM_START, RPM_SIZE, DCACHE_OFF);
 
-	/* TODO: disable Page 0 for trapping NULL pointer references. */
-
 	mmu_config_range_kb(SRAM_START, SRAM_END - SRAM_START,
 		DCACHE_WRITEBACK);
 
@@ -61,6 +59,9 @@ void setup_mmu(enum dram_state dram)
 
 	mmu_disable_range(DRAM_END, 4096 - DRAM_END);
 
+	/* disable Page 0 for trapping NULL pointer references. */
+	mmu_disable_range_kb(0, 1);
+
 	mmu_init();
 
 	dcache_mmu_enable();