diff --git a/waku/v2/node/wakunode2_test.go b/waku/v2/node/wakunode2_test.go
index a3436b108..be22d7fcb 100644
--- a/waku/v2/node/wakunode2_test.go
+++ b/waku/v2/node/wakunode2_test.go
@@ -117,6 +117,9 @@ func Test5000(t *testing.T) {
 			case <-ticker.C:
 				require.Fail(t, "Timeout Sub1")
 			case msg := <-sub1.C:
+				if msg == nil {
+					return
+				}
 				if bytes.Equal(msg.Message().Payload, maxMsgBytes) {
 					return
 				}
@@ -135,6 +138,9 @@ func Test5000(t *testing.T) {
 			case <-ticker.C:
 				require.Fail(t, "Timeout Sub2")
 			case msg := <-sub2.C:
+				if msg == nil {
+					return
+				}
 				if bytes.Equal(msg.Message().Payload, maxMsgBytes) {
 					return
 				}