diff --git a/src/drivers/rc/crsf_rc/CrsfRc.cpp b/src/drivers/rc/crsf_rc/CrsfRc.cpp
index 658c523d75..afaf544af8 100644
--- a/src/drivers/rc/crsf_rc/CrsfRc.cpp
+++ b/src/drivers/rc/crsf_rc/CrsfRc.cpp
@@ -201,7 +201,7 @@ void CrsfRc::Run()
 					break;
 
 				case 1:
-					vehicle_gps_position_s vehicle_gps_position;
+					sensor_gps_s vehicle_gps_position;
 
 					if (_vehicle_gps_position_sub.update(&vehicle_gps_position)) {
 						int32_t latitude = vehicle_gps_position.lat;
@@ -264,10 +264,6 @@ void CrsfRc::Run()
 							flight_mode = "Auto";
 							break;
 
-						case vehicle_status_s::NAVIGATION_STATE_AUTO_LANDENGFAIL:
-							flight_mode = "Failure";
-							break;
-
 						case vehicle_status_s::NAVIGATION_STATE_ACRO:
 							flight_mode = "Acro";
 							break;
diff --git a/src/drivers/rc/crsf_rc/CrsfRc.hpp b/src/drivers/rc/crsf_rc/CrsfRc.hpp
index da4c51c980..3218c2acfd 100644
--- a/src/drivers/rc/crsf_rc/CrsfRc.hpp
+++ b/src/drivers/rc/crsf_rc/CrsfRc.hpp
@@ -50,7 +50,7 @@
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/battery_status.h>
 #include <uORB/topics/vehicle_attitude.h>
-#include <uORB/topics/vehicle_gps_position.h>
+#include <uORB/topics/sensor_gps.h>
 #include <uORB/topics/vehicle_status.h>
 
 class CrsfRc : public ModuleBase<CrsfRc>, public ModuleParams, public px4::ScheduledWorkItem