diff --git a/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs b/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs
index 1e412154..422e6c8b 100644
--- a/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs
+++ b/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs
@@ -432,6 +432,8 @@ runMessagingTCP env@MessagingTCP{..} = liftIO do
         -- FIXME: make-sure-it-is-correct
         already <- readTVarIO _tcpPeerXp <&> HashMap.member pip
 
+        guard (not already)
+
         msgs <- readTVarIO defs <&> HashMap.findWithDefault mempty pip
 
         unless (L.null msgs) do
@@ -456,8 +458,6 @@ runMessagingTCP env@MessagingTCP{..} = liftIO do
                 modifyTVar defs $ HashMap.delete pip
                 forM_ mss $ \m -> writeTQueue q (pip, snd m)
 
-          pure ()
-
     stat <- ContT $ withAsync $ forever do
       pause @'Seconds 120
       ps <- readTVarIO $ view tcpConnPeer env