diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go
index e46d073a4..f5dac6caa 100644
--- a/exchange/bitswap/network/ipfs_impl.go
+++ b/exchange/bitswap/network/ipfs_impl.go
@@ -150,17 +150,19 @@ func (bsnet *impl) handleNewStream(s inet.Stream) {
 		return
 	}
 
-	received, err := bsmsg.FromNet(s)
-	if err != nil {
-		go bsnet.receiver.ReceiveError(err)
-		log.Debugf("bitswap net handleNewStream from %s error: %s", s.Conn().RemotePeer(), err)
-		return
-	}
+	for {
+		received, err := bsmsg.FromNet(s)
+		if err != nil {
+			go bsnet.receiver.ReceiveError(err)
+			log.Debugf("bitswap net handleNewStream from %s error: %s", s.Conn().RemotePeer(), err)
+			return
+		}
 
-	p := s.Conn().RemotePeer()
-	ctx := context.Background()
-	log.Debugf("bitswap net handleNewStream from %s", s.Conn().RemotePeer())
-	bsnet.receiver.ReceiveMessage(ctx, p, received)
+		p := s.Conn().RemotePeer()
+		ctx := context.Background()
+		log.Debugf("bitswap net handleNewStream from %s", s.Conn().RemotePeer())
+		bsnet.receiver.ReceiveMessage(ctx, p, received)
+	}
 }
 
 type netNotifiee impl