diff --git a/src/drivers/drv_rc_input.h b/src/drivers/drv_rc_input.h
index fce5249b5e..b82ced3845 100644
--- a/src/drivers/drv_rc_input.h
+++ b/src/drivers/drv_rc_input.h
@@ -119,7 +119,7 @@ struct rc_input_values {
 	/** number of channels actually being seen */
 	uint32_t		channel_count;
 
-	/** receive signal strength indicator (RSSI): < 0: Undefined, 0: no signal, 255: full reception */
+	/** receive signal strength indicator (RSSI): < 0: Undefined, 0: no signal, 100: full reception */
 	int32_t			rssi;
 
 	/**
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp
index 8801a92aa2..04b368a434 100644
--- a/src/modules/mavlink/mavlink_receiver.cpp
+++ b/src/modules/mavlink/mavlink_receiver.cpp
@@ -926,8 +926,9 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg)
 		rc.rc_lost = false;
 		rc.rc_lost_frame_count = 0;
 		rc.rc_total_frame_count = 1;
-		rc.rc_ppm_frame_length = (2 * rc.channel_count + 4) * 1000;
+		rc.rc_ppm_frame_length = 0;
 		rc.input_source = RC_INPUT_SOURCE_MAVLINK;
+		rc.rssi = RC_INPUT_RSSI_MAX;
 		rc.values[0] = man.x * 500 + 1500;
 		rc.values[1] = man.y * 500 + 1500;
 		rc.values[2] = man.r / 2.0f + 1500;