diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp	(revision 1ede4803f1f5dffa55644d908062b52bf71394e7)
+++ b/src/validation.cpp	(date 1731581531144)
@@ -2807,7 +2807,6 @@
     try {
     {
         bool fFlushForPrune = false;
-        bool fDoFullFlush = false;
 
         CoinsCacheSizeState cache_state = GetCoinsCacheSizeState();
         LOCK(m_blockman.cs_LastBlockFile);
@@ -2869,7 +2868,8 @@
         // It's been very long since we flushed the cache. Do this infrequently, to optimize cache usage.
         bool fPeriodicFlush = mode == FlushStateMode::PERIODIC && nNow > m_last_flush + DATABASE_FLUSH_INTERVAL;
         // Combine all conditions that result in a full cache flush.
-        fDoFullFlush = (mode == FlushStateMode::FORCE_FLUSH) || (mode == FlushStateMode::FORCE_SYNC) || fCacheLarge || fCacheCritical || fPeriodicFlush || fFlushForPrune;
+        bool should_empty_cache = (mode == FlushStateMode::FORCE_FLUSH) || fCacheLarge || fCacheCritical;
+        bool fDoFullFlush = should_empty_cache || (mode == FlushStateMode::FORCE_SYNC) || fPeriodicFlush || fFlushForPrune;
         // Write blocks and block index to disk.
         if (fDoFullFlush || fPeriodicWrite) {
             // Ensure we can write block index
@@ -2917,8 +2917,7 @@
                 return FatalError(m_chainman.GetNotifications(), state, _("Disk space is too low!"));
             }
             // Flush the chainstate (which may refer to block index entries).
-            const auto empty_cache{(mode == FlushStateMode::FORCE_FLUSH) || fCacheLarge || fCacheCritical};
-            if (empty_cache ? !CoinsTip().Flush() : !CoinsTip().Sync()) {
+            if (should_empty_cache ? !CoinsTip().Flush() : !CoinsTip().Sync()) {
                 return FatalError(m_chainman.GetNotifications(), state, _("Failed to write to coin database."));
             }
             m_last_flush = nNow;

diff --git a/doc/tracing.md b/doc/tracing.md
--- a/doc/tracing.md	(revision 1ede4803f1f5dffa55644d908062b52bf71394e7)
+++ b/doc/tracing.md	(date 1731581879407)
@@ -126,8 +126,8 @@

 Arguments passed:
 1. Time it took to flush the cache microseconds as `int64`
-2. Flush state mode as `uint32`. It's an enumerator class with values `0`
-   (`NONE`), `1` (`IF_NEEDED`), `2` (`PERIODIC`), `3` (`ALWAYS`)
+2. Flush state mode as `uint32`. It's an enumerator class with values
+   `0` (`NONE`), `1` (`IF_NEEDED`), `2` (`PERIODIC`), `3` (`FORCE_SYNC`), `4` (`FORCE_FLUSH`)
 3. Cache size (number of coins) before the flush as `uint64`
 4. Cache memory usage in bytes as `uint64`
 5. If pruning caused the flush as `bool`

diff --git a/contrib/tracing/README.md b/contrib/tracing/README.md
--- a/contrib/tracing/README.md	(revision 1ede4803f1f5dffa55644d908062b52bf71394e7)
+++ b/contrib/tracing/README.md	(date 1731581127426)
@@ -247,10 +246,10 @@

 Logging utxocache flushes. Ctrl-C to end...
-Duration (µs)   Mode       Coins Count     Memory Usage    Prune
-730451          IF_NEEDED  22990           3323.54 kB      True
-637657          ALWAYS     122320          17124.80 kB     False
-81349           ALWAYS     0               1383.49 kB      False
+Duration (µs)   Mode        Coins Count     Memory Usage    Prune
+730451          IF_NEEDED   22990           3323.54 kB      True
+637657          FORCE_FLUSH 122320          17124.80 kB     False
+81349           FORCE_FLUSH 0               1383.49 kB      False


diff --git a/contrib/tracing/log_utxocache_flush.py b/contrib/tracing/log_utxocache_flush.py
--- a/contrib/tracing/log_utxocache_flush.py	(revision 1ede4803f1f5dffa55644d908062b52bf71394e7)
+++ b/contrib/tracing/log_utxocache_flush.py	(date 1731582100621)
@@ -45,7 +45,8 @@
     'NONE',
     'IF_NEEDED',
     'PERIODIC',
-    'ALWAYS'
+    'FORCE_SYNC',
+    'FORCE_FLUSH',
 ]

diff --git a/test/functional/interface_usdt_utxocache.py b/test/functional/interface_usdt_utxocache.py
--- a/test/functional/interface_usdt_utxocache.py	(revision eb1257260b2f4ede605241f1fb514452d63305c8)
+++ b/test/functional/interface_usdt_utxocache.py	(date 1731587669301)
@@ -365,7 +365,7 @@
         bpf["utxocache_flush"].open_perf_buffer(handle_utxocache_flush)
 
         self.log.info("stop the node to flush the UTXO cache")
-        UTXOS_IN_CACHE = 2 # might need to be changed if the earlier tests are modified
+        UTXOS_IN_CACHE = 3 # might need to be changed if the earlier tests are modified
         # A node shutdown causes two flushes. One that flushes UTXOS_IN_CACHE
         # UTXOs and one that flushes 0 UTXOs. Normally the 0-UTXO-flush is the
         # second flush, however it can happen that the order changes.
@@ -395,7 +395,7 @@
         bpf["utxocache_flush"].open_perf_buffer(handle_utxocache_flush)
 
         self.log.info(f"prune blockchain to trigger a flush for pruning")
-        expected_flushes.append({"mode": "NONE", "for_prune": True, "size": 0})
+        expected_flushes.append({"mode": "NONE", "for_prune": True, "size": BLOCKS_TO_MINE})
         self.nodes[0].pruneblockchain(315)
 
         bpf.perf_buffer_poll(timeout=500)