diff --git a/src/AmqpBundle/Amqp/Consumer.php b/src/AmqpBundle/Amqp/Consumer.php
index 91061bd..766e7ad 100644
--- a/src/AmqpBundle/Amqp/Consumer.php
+++ b/src/AmqpBundle/Amqp/Consumer.php
@@ -34,15 +34,16 @@ public function __construct(\AMQPQueue $queue, array $queueOptions)
     public function getMessage(int $flags = AMQP_AUTOACK): ?\AMQPEnvelope
     {
         $envelope = $this->call($this->queue, 'get', [$flags]);
+        $envelope = $envelope === false ? null : $envelope;
 
         if ($this->eventDispatcher) {
             $preRetrieveEvent = new PreRetrieveEvent($envelope);
-            $this->eventDispatcher->dispatch( $preRetrieveEvent, PreRetrieveEvent::NAME);
+            $this->eventDispatcher->dispatch($preRetrieveEvent, PreRetrieveEvent::NAME);
 
             return $preRetrieveEvent->getEnvelope();
         }
 
-        return $envelope === false ? null : $envelope;
+        return $envelope;
     }
 
     /**
diff --git a/src/AmqpBundle/Event/PreRetrieveEvent.php b/src/AmqpBundle/Event/PreRetrieveEvent.php
index f91f1cc..f520801 100644
--- a/src/AmqpBundle/Event/PreRetrieveEvent.php
+++ b/src/AmqpBundle/Event/PreRetrieveEvent.php
@@ -12,19 +12,19 @@ class PreRetrieveEvent extends Event
 {
     const NAME = 'amqp.pre_retrieve';
 
-    private AMQPEnvelope $envelope;
+    private ?AMQPEnvelope $envelope;
 
-    public function __construct(AMQPEnvelope $envelope)
+    public function __construct(?AMQPEnvelope $envelope)
     {
         $this->envelope = $envelope;
     }
 
-    public function getEnvelope(): AMQPEnvelope
+    public function getEnvelope(): ?AMQPEnvelope
     {
         return $this->envelope;
     }
 
-    public function setEnvelope(AMQPEnvelope $envelope)
+    public function setEnvelope(?AMQPEnvelope $envelope)
     {
         $this->envelope = $envelope;
     }