diff --git a/osal/FreeRTOS/QueueMapManager.cpp b/osal/FreeRTOS/QueueMapManager.cpp
index 8e8b0c3e..b58fd4fe 100644
--- a/osal/FreeRTOS/QueueMapManager.cpp
+++ b/osal/FreeRTOS/QueueMapManager.cpp
@@ -17,10 +17,12 @@ QueueMapManager* QueueMapManager::instance() {
 
 ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueueId_t* id) {
     MutexGuard lock(mapLock);
-    uint32_t currentId = queueCounter++;
+    uint32_t currentId = queueCounter;
+    queueCounter++;
     if(currentId == MessageQueueIF::NO_QUEUE) {
         // Skip the NO_QUEUE value
-        currentId = queueCounter++;
+        currentId = queueCounter;
+        queueCounter++;
     }
     auto returnPair = queueMap.emplace(currentId, queue);
     if(not returnPair.second) {
diff --git a/osal/host/QueueMapManager.cpp b/osal/host/QueueMapManager.cpp
index cea79f7b..5117d551 100644
--- a/osal/host/QueueMapManager.cpp
+++ b/osal/host/QueueMapManager.cpp
@@ -24,10 +24,12 @@ QueueMapManager* QueueMapManager::instance() {
 ReturnValue_t QueueMapManager::addMessageQueue(
         MessageQueueIF* queueToInsert, MessageQueueId_t* id) {
     MutexGuard lock(mapLock);
-    uint32_t currentId = queueCounter++;
+    uint32_t currentId = queueCounter;
+    queueCounter++;
     if(currentId == MessageQueueIF::NO_QUEUE) {
         // Skip the NO_QUEUE value
-        currentId = queueCounter++;
+        currentId = queueCounter;
+        queueCounter++;
     }
     auto returnPair = queueMap.emplace(currentId, queueToInsert);
     if(not returnPair.second) {