diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan
index 0ef50dc4c..42015e3ae 100644
--- a/test/sanitizer_suppressions/tsan
+++ b/test/sanitizer_suppressions/tsan
@@ -1,56 +1,67 @@
 # ThreadSanitizer suppressions
 # ============================
+#
+# https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
 
 # double locks (TODO fix)
 mutex:g_genesis_wait_mutex
 mutex:Interrupt
 mutex:CThreadInterrupt
 mutex:CConnman::Interrupt
 mutex:CConnman::WakeMessageHandler
 mutex:CConnman::ThreadOpenConnections
 mutex:CConnman::ThreadOpenAddedConnections
 mutex:CConnman::SocketHandler
 mutex:UpdateTip
 mutex:PeerManager::UpdatedBlockTip
 mutex:g_best_block_mutex
 mutex:rcu_tests::synchronize_test
 # race (TODO fix)
 race:CConnman::WakeMessageHandler
 race:CConnman::ThreadMessageHandler
 race:fHaveGenesis
 race:ProcessNewBlock
 race:ThreadImport
 race:WalletBatch::WriteHDChain
 race:CZMQAbstractPublishNotifier::SendMessage
 race:BerkeleyBatch
 race:leveldb::DBImpl::DeleteObsoleteFiles
 race:bitcoin-qt
 # deadlock (TODO fix)
 deadlock:CConnman::ForNode
 deadlock:CConnman::GetNodeStats
 deadlock:CChainState::ConnectTip
 deadlock:UpdateTip
 deadlock:wallet_tests::CreateWalletFromFile
 
 # Lock order inversion due to the large cs_main lock from Shutdown, which comes
 # before the cs_proofrequest lock
 deadlock:CConnman::StopNodes
 
 # WalletBatch (unidentified deadlock)
 deadlock:WalletBatch
 
 # Intentional deadlock in tests
 deadlock:TestPotentialDeadLockDetected
 
 # Wildcard for all gui tests, should be replaced with non-wildcard suppressions
 mutex:src/qt/test/*
 race:src/qt/test/*
 deadlock:src/qt/test/*
 
 # External libraries
 deadlock:libdb
 thread:src/leveldb/*
 
+# Intermittent issues
+# -------------------
+#
+# Suppressions that follow might only happen intermittently, thus they are not
+# reproducible. Make sure to include a link to a full trace.
+
+# https://github.com/bitcoin/bitcoin/issues/20618
+race:CZMQAbstractPublishNotifier::SendZmqMessage
+
 # Reverselock tests is triggering lock-order-inversion errors when run as part
 # of test_bitcoin.
 deadlock:reverselock_tests::reverselock_errors