diff --git a/src/messages/LimitedQueue.hpp b/src/messages/LimitedQueue.hpp
index 2ed68fb4..61e8db56 100644
--- a/src/messages/LimitedQueue.hpp
+++ b/src/messages/LimitedQueue.hpp
@@ -253,8 +253,6 @@ private:
 
         deleted = this->chunks_->front()->at(this->firstChunkOffset_);
 
-        this->firstChunkOffset_++;
-
         // need to delete the first chunk
         if (this->firstChunkOffset_ == this->chunks_->front()->size() - 1)
         {
@@ -275,6 +273,11 @@ private:
             this->chunks_ = newVector;
             this->firstChunkOffset_ = 0;
         }
+        else
+        {
+            this->firstChunkOffset_++;
+        }
+
         return true;
     }