diff --git a/include/sp/protocol/MessageFactory.h b/include/sp/protocol/MessageFactory.h
index eaea45b..f2775b9 100644
--- a/include/sp/protocol/MessageFactory.h
+++ b/include/sp/protocol/MessageFactory.h
@@ -19,8 +19,11 @@ struct ArrayFiller {};
 
 template <typename TBase, typename... TMessages>
 struct ArrayFiller<TBase, std::tuple<TMessages...>> {
-	static void ArrayAppend(details::ArrayType<TBase>& array) {
+	static ArrayType<TBase> ArrayCreate() {
+		ArrayType<TBase> array;
+		array.reserve(sizeof...(TMessages));
 		ArrayFiller<TBase, TMessages...>::ArrayAppend(array);
+		return array;
 	}
 };
 
@@ -46,9 +49,7 @@ class MessageFactory {
   public:
 	using IdType = typename TBase::MsgIdType;
 
-	MessageFactory() {
-		details::ArrayFiller<TBase, TTMessages>::ArrayAppend(m_Factory);
-	}
+	MessageFactory() : m_Factory(details::ArrayFiller<TBase, TTMessages>::ArrayCreate()) {}
 
 	std::unique_ptr<TBase> CreateMessage(IdType id) {
 		if (id >= m_Factory.size())