diff --git a/src/fsfw/modes/ModeMessage.cpp b/src/fsfw/modes/ModeMessage.cpp
index efe6d534..0d7eaeea 100644
--- a/src/fsfw/modes/ModeMessage.cpp
+++ b/src/fsfw/modes/ModeMessage.cpp
@@ -34,3 +34,7 @@ void ModeMessage::setModeAnnounceMessage(CommandMessage& message, bool recursive
   }
   message.setCommand(cmd);
 }
+
+void ModeMessage::setCmdModeModeMessage(CommandMessage& message, Mode_t mode, Submode_t submode) {
+  setModeMessage(&message, CMD_MODE_COMMAND, mode, submode);
+}
diff --git a/src/fsfw/modes/ModeMessage.h b/src/fsfw/modes/ModeMessage.h
index 1582ccd4..89203f6e 100644
--- a/src/fsfw/modes/ModeMessage.h
+++ b/src/fsfw/modes/ModeMessage.h
@@ -38,12 +38,13 @@ class ModeMessage {
 
   ModeMessage() = delete;
 
+  static void setModeMessage(CommandMessage* message, Command_t command, Mode_t mode,
+                             Submode_t submode);
   static Mode_t getMode(const CommandMessage* message);
   static Submode_t getSubmode(const CommandMessage* message);
   static ReturnValue_t getCantReachModeReason(const CommandMessage* message);
 
-  static void setModeMessage(CommandMessage* message, Command_t command, Mode_t mode,
-                             Submode_t submode);
+  static void setCmdModeModeMessage(CommandMessage& message, Mode_t mode, Submode_t submode);
   static void setModeAnnounceMessage(CommandMessage& message, bool recursive);
   static void setCantReachMode(CommandMessage* message, ReturnValue_t reason);
   static void clear(CommandMessage* message);