diff --git a/osal/FreeRTOS/QueueMapManager.cpp b/osal/FreeRTOS/QueueMapManager.cpp
index 51cfe11d..b58fd4fe 100644
--- a/osal/FreeRTOS/QueueMapManager.cpp
+++ b/osal/FreeRTOS/QueueMapManager.cpp
@@ -17,7 +17,13 @@ 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;
+        queueCounter++;
+    }
     auto returnPair = queueMap.emplace(currentId, queue);
     if(not returnPair.second) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
diff --git a/osal/FreeRTOS/QueueMapManager.h b/osal/FreeRTOS/QueueMapManager.h
index 07ca8b9e..032fb2ba 100644
--- a/osal/FreeRTOS/QueueMapManager.h
+++ b/osal/FreeRTOS/QueueMapManager.h
@@ -39,7 +39,7 @@ private:
     QueueMapManager();
     ~QueueMapManager();
 
-    uint32_t queueCounter = 0;
+    uint32_t queueCounter = MessageQueueIF::NO_QUEUE + 1;
     MutexIF* mapLock;
     QueueMap queueMap;
     static QueueMapManager* mqManagerInstance;
diff --git a/osal/host/QueueMapManager.cpp b/osal/host/QueueMapManager.cpp
index 879bc36d..5117d551 100644
--- a/osal/host/QueueMapManager.cpp
+++ b/osal/host/QueueMapManager.cpp
@@ -24,7 +24,13 @@ 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;
+        queueCounter++;
+    }
     auto returnPair = queueMap.emplace(currentId, queueToInsert);
     if(not returnPair.second) {
         /* This should never happen for the atomic variable. */
diff --git a/osal/host/QueueMapManager.h b/osal/host/QueueMapManager.h
index e274bed2..2dd2a01d 100644
--- a/osal/host/QueueMapManager.h
+++ b/osal/host/QueueMapManager.h
@@ -41,7 +41,7 @@ private:
     QueueMapManager();
     ~QueueMapManager();
 
-    uint32_t queueCounter = 0;
+    uint32_t queueCounter = MessageQueueIF::NO_QUEUE + 1;
     MutexIF* mapLock;
     QueueMap queueMap;
     static QueueMapManager* mqManagerInstance;