diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3928,11 +3928,9 @@
         chainActive.Tip() ? std::llabs(chainActive.Tip()->GetReceivedTimeDiff())
                           : 0;
 
-    bool isSameHeightAndMoreHonestlyMined =
-        chainActive.Tip() &&
-        (pindex->nChainWork == chainActive.Tip()->nChainWork) &&
-        (newBlockTimeDiff < chainTipTimeDiff);
-    if (isSameHeightAndMoreHonestlyMined) {
+    bool isSameHeight = chainActive.Tip() &&
+                        (pindex->nChainWork == chainActive.Tip()->nChainWork);
+    if (isSameHeight) {
         LogPrintf("Chain tip timestamp-to-received-time difference: hash=%s, "
                   "diff=%d\n",
                   chainActive.Tip()->GetBlockHash().ToString(),
@@ -3942,6 +3940,8 @@
                   pindex->GetBlockHash().ToString(), newBlockTimeDiff);
     }
 
+    bool isSameHeightAndMoreHonestlyMined =
+        isSameHeight && (newBlockTimeDiff < chainTipTimeDiff);
     bool fHasMoreWork =
         (chainActive.Tip()
              ? (pindex->nChainWork > chainActive.Tip()->nChainWork) ||
diff --git a/test/functional/sendheaders-selfish-mining.py b/test/functional/sendheaders-selfish-mining.py
--- a/test/functional/sendheaders-selfish-mining.py
+++ b/test/functional/sendheaders-selfish-mining.py
@@ -111,6 +111,7 @@
         # Selfishly-mined block is no longer the active tip
         actual_tip = int(self.nodes[1].getbestblockhash(), 16)
         assert_equal(actual_tip, honest_block2.sha256)
+        assert()
 
 
 if __name__ == '__main__':