diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index b3575e08260f..52b3de4de290 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1169,10 +1169,10 @@ dontblock:
 			}
 			cm = cmn;
 		}
-		if (so->so_rcv.sb_mb)
+		if (m != NULL)
 			nextrecord = so->so_rcv.sb_mb->m_nextpkt;
 		else
-			nextrecord = NULL;
+			nextrecord = so->so_rcv.sb_mb;
 		orig_resid = 0;
 	}
 	if (m != NULL) {