diff --git a/osal/FreeRTOS/QueueMapManager.cpp b/osal/FreeRTOS/QueueMapManager.cpp
index e60b5689..8e8b0c3e 100644
--- a/osal/FreeRTOS/QueueMapManager.cpp
+++ b/osal/FreeRTOS/QueueMapManager.cpp
@@ -20,7 +20,7 @@ ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueue
     uint32_t currentId = queueCounter++;
     if(currentId == MessageQueueIF::NO_QUEUE) {
         // Skip the NO_QUEUE value
-        currentId++;
+        currentId = queueCounter++;
     }
     auto returnPair = queueMap.emplace(currentId, queue);
     if(not returnPair.second) {