diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 352d2ca0c..d6df4aaf4 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -1669,7 +1669,7 @@ cancelAllRequestsForBlock (tr_swarm          * s,
     {
       tr_peer * p = peers[i];
 
-      if ((p != no_notify) && (p != NULL))
+      if ((p != no_notify) && tr_isPeerMsgs (p))
         {
           tr_historyAdd (&p->cancelsSentToPeer, tr_time (), 1);
           tr_peerMsgsCancel (PEER_MSGS(p), block);