diff --git a/server.go b/server.go
index ca3e6dd2..fa871d61 100644
--- a/server.go
+++ b/server.go
@@ -839,6 +839,9 @@ func (sp *serverPeer) OnGetCFHeaders(_ *peer.Peer, msg *wire.MsgGetCFHeaders) {
 		peerLog.Warnf("Header lookup failed: %v", err)
 		return
 	}
+	if len(hashList) == 0 {
+		return
+	}
 
 	// Generate cfheaders message and send it.
 	headersMsg := wire.NewMsgCFHeaders()