diff --git a/components/cplusplus/Queue.h b/components/cplusplus/Queue.h
index 351e3ec66b1c4585ad97fac97aaca1137ee4756a..23a4638798825eafa267f4935ff5e5fe6fe84518 100644
--- a/components/cplusplus/Queue.h
+++ b/components/cplusplus/Queue.h
@@ -68,7 +68,7 @@ public:
 private:
     struct rt_messagequeue mID;
 
-    char mPool[(sizeof(struct rt_messagequeue) + sizeof(T)) * queue_sz];
+    char mPool[(sizeof(void *) + RT_ALIGN(sizeof(T), RT_ALIGN_SIZE)) * queue_sz];
 };
 
 }