diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 2820e56fe0..36a8bf5d68 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -611,17 +611,6 @@ void Mavlink::mavlink_update_system()
 		_param_initialized = true;
 	}
 
-	/* warn users that they need to reboot to take this
-	 * into effect
-	 */
-	if (system_id != mavlink_system.sysid) {
-		send_statustext_critical("Save params and reboot to change SYSID");
-	}
-
-	if (component_id != mavlink_system.compid) {
-		send_statustext_critical("Save params and reboot to change COMPID");
-	}
-
 	int32_t system_type;
 	param_get(_param_system_type, &system_type);
 
diff --git a/src/modules/mavlink/mavlink_params.c b/src/modules/mavlink/mavlink_params.c
index cd02a967aa..db639d31c9 100644
--- a/src/modules/mavlink/mavlink_params.c
+++ b/src/modules/mavlink/mavlink_params.c
@@ -36,6 +36,7 @@
  * @group MAVLink
  * @min 1
  * @max 250
+ * @reboot_required true
  */
 PARAM_DEFINE_INT32(MAV_SYS_ID, 1);
 
@@ -44,6 +45,7 @@ PARAM_DEFINE_INT32(MAV_SYS_ID, 1);
  * @group MAVLink
  * @min 1
  * @max 250
+ * @reboot_required true
  */
 PARAM_DEFINE_INT32(MAV_COMP_ID, 1);