diff --git a/src/modules/mavlink/CMakeLists.txt b/src/modules/mavlink/CMakeLists.txt
index 3038a0f705..f42dd6fa9b 100644
--- a/src/modules/mavlink/CMakeLists.txt
+++ b/src/modules/mavlink/CMakeLists.txt
@@ -44,7 +44,6 @@ add_custom_command(
 	COMMAND
 		${PYTHON_EXECUTABLE} ${MAVLINK_GIT_DIR}/pymavlink/tools/mavgen.py
 			--lang C --wire-protocol 2.0
-			--exit-code
 			--output ${MAVLINK_LIBRARY_DIR}
 			${MAVLINK_GIT_DIR}/message_definitions/v1.0/${MAVLINK_DIALECT_UAVIONIX}.xml > ${CMAKE_CURRENT_BINARY_DIR}/mavgen_${MAVLINK_DIALECT_UAVIONIX}.log
 	DEPENDS
@@ -63,7 +62,6 @@ add_custom_command(
 	COMMAND
 		${PYTHON_EXECUTABLE} ${MAVLINK_GIT_DIR}/pymavlink/tools/mavgen.py
 			--lang C --wire-protocol 2.0
-			--exit-code
 			--output ${MAVLINK_LIBRARY_DIR}
 			${MAVLINK_GIT_DIR}/message_definitions/v1.0/${CONFIG_MAVLINK_DIALECT}.xml > ${CMAKE_CURRENT_BINARY_DIR}/mavgen_${CONFIG_MAVLINK_DIALECT}.log
 	DEPENDS
diff --git a/src/modules/mavlink/mavlink b/src/modules/mavlink/mavlink
index d65952bacc..bb52e30d2b 160000
--- a/src/modules/mavlink/mavlink
+++ b/src/modules/mavlink/mavlink
@@ -1 +1 @@
-Subproject commit d65952bacc02c4a5a1ed8249be73e6a66fa800ab
+Subproject commit bb52e30d2b924d5a250f2400144d33012271a19d