diff --git a/inc/fsfw/osal/freertos/QueueMapManager.h b/inc/fsfw/osal/freertos/QueueMapManager.h
index 7e999b0d..dbe0526b 100644
--- a/inc/fsfw/osal/freertos/QueueMapManager.h
+++ b/inc/fsfw/osal/freertos/QueueMapManager.h
@@ -39,8 +39,7 @@ private:
     QueueMapManager();
     ~QueueMapManager();
 
-    // Start at 1 because 0 might be the NO_QUEUE value
-    uint32_t queueCounter = 1;
+    uint32_t queueCounter = MessageQueueIF::NO_QUEUE + 1;
     MutexIF* mapLock;
     QueueMap queueMap;
     static QueueMapManager* mqManagerInstance;
diff --git a/inc/fsfw/osal/host/QueueMapManager.h b/inc/fsfw/osal/host/QueueMapManager.h
index e274bed2..2dd2a01d 100644
--- a/inc/fsfw/osal/host/QueueMapManager.h
+++ b/inc/fsfw/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;