diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2746,7 +2746,7 @@
     return true;
 }
 
-static void NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {
+static bool NotifyHeaderTip() LOCKS_EXCLUDED(cs_main) {
     bool fNotify = false;
     bool fInitialBlockDownload = false;
     static CBlockIndex *pindexHeaderOld = nullptr;
@@ -2767,6 +2767,7 @@
     if (fNotify) {
         uiInterface.NotifyHeaderTip(fInitialBlockDownload, pindexHeader);
     }
+    return fNotify;
 }
 
 static void LimitValidationInterfaceQueue() LOCKS_EXCLUDED(cs_main) {
@@ -3988,8 +3989,7 @@
         }
     }
 
-    NotifyHeaderTip();
-    {
+    if (NotifyHeaderTip()) {
         LOCK(cs_main);
         if (::ChainstateActive().IsInitialBlockDownload() && ppindex &&
             *ppindex) {