diff --git a/apps/commander/commander.c b/apps/commander/commander.c
index f3568ee8d0..33f1832272 100644
--- a/apps/commander/commander.c
+++ b/apps/commander/commander.c
@@ -1845,15 +1845,16 @@ int commander_thread_main(int argc, char *argv[])
 					update_state_machine_mode_manual(stat_pub, &current_status, mavlink_fd);
 
 				} else if (sp_man.manual_override_switch < -STICK_ON_OFF_LIMIT) {
-					/* check auto mode switch for correct mode */
-					if (sp_man.auto_mode_switch > STICK_ON_OFF_LIMIT) {
-						/* enable guided mode */
-						update_state_machine_mode_guided(stat_pub, &current_status, mavlink_fd);
+					// /* check auto mode switch for correct mode */
+					// if (sp_man.auto_mode_switch > STICK_ON_OFF_LIMIT) {
+					// 	/* enable guided mode */
+					// 	update_state_machine_mode_guided(stat_pub, &current_status, mavlink_fd);
 
-					} else if (sp_man.auto_mode_switch < -STICK_ON_OFF_LIMIT) {
+					// } else if (sp_man.auto_mode_switch < -STICK_ON_OFF_LIMIT) {
+						// XXX hardcode to auto for now
 						update_state_machine_mode_auto(stat_pub, &current_status, mavlink_fd);
 
-					}
+					// }
 
 				} else {
 					/* center stick position, set SAS for all vehicle types */