diff --git a/src/main/java/com/rabbitmq/client/amqp/impl/AmqpRpcServer.java b/src/main/java/com/rabbitmq/client/amqp/impl/AmqpRpcServer.java
index 5e3822840..d29ec9dfb 100644
--- a/src/main/java/com/rabbitmq/client/amqp/impl/AmqpRpcServer.java
+++ b/src/main/java/com/rabbitmq/client/amqp/impl/AmqpRpcServer.java
@@ -85,7 +85,13 @@ public Message message(byte[] body) {
       this.correlationIdExtractor = builder.correlationIdExtractor();
     }
     if (builder.replyPostProcessor() == null) {
-      this.replyPostProcessor = Message::correlationId;
+      this.replyPostProcessor =
+          (msg, corrId) -> {
+            if (msg != null) {
+              msg.correlationId(corrId);
+            }
+            return msg;
+          };
     } else {
       this.replyPostProcessor = builder.replyPostProcessor();
     }