diff --git a/src/platform/cannonlake/cannonlake.x.in b/src/platform/cannonlake/cannonlake.x.in
index 0ed5bc602..47acd5e02 100644
--- a/src/platform/cannonlake/cannonlake.x.in
+++ b/src/platform/cannonlake/cannonlake.x.in
@@ -158,7 +158,7 @@ _memmap_cacheattr_bp_base = 0x22022000;
 _memmap_cacheattr_unused_mask = 0x00F00FFF;
 _memmap_cacheattr_wb_trapnull = 0x4422422F;
 _memmap_cacheattr_wba_trapnull = 0x4422422F;
-_memmap_cacheattr_wbna_trapnull = 0x25222222;
+_memmap_cacheattr_wbna_trapnull = 0xFF42FFF2;
 _memmap_cacheattr_wt_trapnull = 0x1122122F;
 _memmap_cacheattr_bp_trapnull = 0x2222222F;
 _memmap_cacheattr_wb_strict = 0x44F24FFF;