diff --git a/firmware/src/cmdr_joystick.cpp b/firmware/src/cmdr_joystick.cpp
index d3018da..20ca156 100644
--- a/firmware/src/cmdr_joystick.cpp
+++ b/firmware/src/cmdr_joystick.cpp
@@ -43,7 +43,6 @@ int gimbal_mode = GIMBAL_MODE_FRSKY_M7;
 
 bool toggle_button_arm = false;
 bool toggle_button_mode = false;
-int toggle_button_arm_previous_value = HIGH;
 
 const int AXIS_10BIT_MAX = 1023;
 const int AXIS_10BIT_MIN = 0;
@@ -259,9 +258,10 @@ void send_elrs_data() {
 
     if (toggle_button_arm) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 4);
     if (toggle_button_mode) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 5);
-    if (digitalRead(BUTTON_FRONT_RIGHT_UPPER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 6);
-    if (digitalRead(BUTTON_FRONT_RIGHT_LOWER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 7);
-    if (digitalRead(BUTTON_TOP_RIGHT_UPPER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 8);
+    if (digitalRead(BUTTON_TOP_LEFT_UPPER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 6);
+    if (digitalRead(BUTTON_TOP_RIGHT_UPPER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 7);
+    if (digitalRead(BUTTON_TOP_LEFT_LOWER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 8);
+    if (digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) elrs.set_data(CRSF_DIGITAL_CHANNEL_MAX, 9);
 
     // Send ELRS data
     elrs.send_data();
@@ -414,13 +414,10 @@ void process_input_data() {
     }
 
     // Check toggle arm button
-    if ((fn_mode == 1) && (digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) != toggle_button_arm_previous_value)) {
-        if ((digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) && (toggle_button_arm == false)) {
-            toggle_button_arm = true;
-        } else if ((digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) && (toggle_button_arm == true)) {
-            toggle_button_arm = false;
-        }
-        toggle_button_arm_previous_value = digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN);
+    if (digitalRead(BUTTON_FRONT_RIGHT_UPPER_PIN) == BUTTON_PRESSED) {
+        toggle_button_arm = true;
+    } else if (digitalRead(BUTTON_FRONT_RIGHT_LOWER_PIN) == BUTTON_PRESSED) {
+        toggle_button_arm = false;
     }
 }