diff --git a/src/osal/freertos/QueueMapManager.cpp b/src/osal/freertos/QueueMapManager.cpp
index d2783f01f..dcb88a1e3 100644
--- a/src/osal/freertos/QueueMapManager.cpp
+++ b/src/osal/freertos/QueueMapManager.cpp
@@ -17,7 +17,7 @@ QueueMapManager* QueueMapManager::instance() {
 
 ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueueId_t* id) {
     MutexGuard lock(mapLock);
-    uint32_t currentId = queueCounter++;
+    uint32_t currentId = ++queueCounter;
     auto returnPair = queueMap.emplace(currentId, queue);
     if(not returnPair.second) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1