diff --git a/wsbroadcastserver/clientconnection.go b/wsbroadcastserver/clientconnection.go
index 5e8763bd95..82b9603a0e 100644
--- a/wsbroadcastserver/clientconnection.go
+++ b/wsbroadcastserver/clientconnection.go
@@ -119,6 +119,7 @@ func (cc *ClientConnection) Remove() {
 
 func (cc *ClientConnection) writeBacklog(ctx context.Context, segment backlog.BacklogSegment) error {
 	var prevSegment backlog.BacklogSegment
+	isFirstSegment := true
 	for !backlog.IsBacklogSegmentNil(segment) {
 		// must get the next segment before the messages to be sent are
 		// retrieved ensures another segment is not added in between calls.
@@ -132,13 +133,14 @@ func (cc *ClientConnection) writeBacklog(ctx context.Context, segment backlog.Ba
 		}
 
 		msgs := prevSegment.Messages()
-		if prevSegment.Contains(uint64(cc.requestedSeqNum)) {
+		if isFirstSegment && prevSegment.Contains(uint64(cc.requestedSeqNum)) {
 			requestedIdx := int(cc.requestedSeqNum) - int(prevSegment.Start())
 			// This might be false if messages were added after we fetched the segment's messages
-			if len(msgs) > requestedIdx {
+			if len(msgs) >= requestedIdx {
 				msgs = msgs[requestedIdx:]
 			}
 		}
+		isFirstSegment = false
 		bm := &m.BroadcastMessage{
 			Version:  m.V1,
 			Messages: msgs,