diff --git a/CMakePresets.json b/CMakePresets.json
index 30feab8ab..b2ed64e97 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -36,7 +36,8 @@
             "name": "debug",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
-                "NV_LOG": "ON"
+                "NV_LOG": "ON",
+                "NV_LOG_ULTRA": "ON"
             },
             "inherits": "base"
         },
diff --git a/src/video/nv/nv3/subsystems/nv3_pgraph.c b/src/video/nv/nv3/subsystems/nv3_pgraph.c
index 20cb97076..dbca46216 100644
--- a/src/video/nv/nv3/subsystems/nv3_pgraph.c
+++ b/src/video/nv/nv3/subsystems/nv3_pgraph.c
@@ -478,7 +478,7 @@ void nv3_pgraph_write(uint32_t address, uint32_t value)
         && address <= NV3_PGRAPH_CONTEXT_CACHE(NV3_PGRAPH_CONTEXT_CACHE_SIZE))
         {
             // Addresses should be aligned to 4 bytes.
-            uint32_t entry = (address - NV3_PGRAPH_CONTEXT_CACHE(0));
+            uint32_t entry = (address - NV3_PGRAPH_CONTEXT_CACHE(0)) >> 2;
 
             nv_log_verbose_only("PGRAPH Context Cache Write (Entry=%04x Value=0x%08x)\n", entry, value);
             nv3->pgraph.context_cache[entry] = value;