diff --git a/src/fsfw/ipc/MessageQueueBase.cpp b/src/fsfw/ipc/MessageQueueBase.cpp
index 8549882f8..1b0934ff3 100644
--- a/src/fsfw/ipc/MessageQueueBase.cpp
+++ b/src/fsfw/ipc/MessageQueueBase.cpp
@@ -37,8 +37,8 @@ MessageQueueId_t MessageQueueBase::getId() const {
   return id;
 }
 
-MqArgs* MessageQueueBase::getMqArgs() {
-  return &args;
+MqArgs& MessageQueueBase::getMqArgs() {
+  return args;
 }
 
 void MessageQueueBase::setDefaultDestination(MessageQueueId_t defaultDestination) {
diff --git a/src/fsfw/ipc/MessageQueueBase.h b/src/fsfw/ipc/MessageQueueBase.h
index 9b05f1aed..8313f69ac 100644
--- a/src/fsfw/ipc/MessageQueueBase.h
+++ b/src/fsfw/ipc/MessageQueueBase.h
@@ -12,7 +12,7 @@ public:
   // Default implementations for MessageQueueIF where possible
   virtual MessageQueueId_t getLastPartner() const override;
   virtual MessageQueueId_t getId() const override;
-  virtual MqArgs* getMqArgs() override;
+  virtual MqArgs& getMqArgs() override;
   virtual void setDefaultDestination(MessageQueueId_t defaultDestination) override;
   virtual MessageQueueId_t getDefaultDestination() const override;
   virtual bool isDefaultDestinationSet() const override;
diff --git a/src/fsfw/ipc/MessageQueueIF.h b/src/fsfw/ipc/MessageQueueIF.h
index e23907706..d7b6889b6 100644
--- a/src/fsfw/ipc/MessageQueueIF.h
+++ b/src/fsfw/ipc/MessageQueueIF.h
@@ -161,7 +161,7 @@ class MessageQueueIF {
 
   virtual bool isDefaultDestinationSet() const = 0;
 
-  virtual MqArgs* getMqArgs() = 0;
+  virtual MqArgs& getMqArgs() = 0;
 };
 
 #endif /* FSFW_IPC_MESSAGEQUEUEIF_H_ */