diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java
index 02c0fd568d832..c3f8254fb5e30 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java
@@ -218,7 +218,10 @@ protected CompletableFuture<Void> failPendingReceive() {
         private void failPendingRawReceives() {
             List<CompletableFuture<RawMessage>> toError = new ArrayList<>();
             while (!pendingRawReceives.isEmpty()) {
-                toError.add(pendingRawReceives.remove());
+                final CompletableFuture<RawMessage> ret = pendingRawReceives.poll();
+                if (ret != null) {
+                    toError.add(ret);
+                }
             }
             toError.forEach((f) -> f.cancel(false));
         }