diff --git a/src/js/fc.js b/src/js/fc.js
index 932f4399..64c72b8c 100644
--- a/src/js/fc.js
+++ b/src/js/fc.js
@@ -372,7 +372,6 @@ var FC = {
             digitalIdlePercent:         0,
             gyroUse32kHz:               0,
             motorPwmInversion:          0,
-            gyroToUse:                  0,
             gyroHighFsr:                0,
             gyroMovementCalibThreshold: 0,
             gyroCalibDuration:          0,
diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js
index 233c1a64..3189a95d 100644
--- a/src/js/msp/MSPHelper.js
+++ b/src/js/msp/MSPHelper.js
@@ -975,7 +975,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
                         } 
                         if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
                             PID_ADVANCED_CONFIG.motorPwmInversion = data.readU8();
-                            PID_ADVANCED_CONFIG.gyroToUse = data.readU8();
+                            SENSOR_ALIGNMENT.gyro_to_use = data.readU8(); // We don't want to double up on storing this state
                             PID_ADVANCED_CONFIG.gyroHighFsr = data.readU8();
                             PID_ADVANCED_CONFIG.gyroMovementCalibThreshold = data.readU8();
                             PID_ADVANCED_CONFIG.gyroCalibDuration = data.readU16();
@@ -1869,7 +1869,7 @@ MspHelper.prototype.crunch = function(code) {
                     buffer.push8(gyroUse32kHz);
                     if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
                         buffer.push8(PID_ADVANCED_CONFIG.motorPwmInversion)
-                              .push8(PID_ADVANCED_CONFIG.gyroToUse)
+                              .push8(SENSOR_ALIGNMENT.gyro_to_use) // We don't want to double up on storing this state
                               .push8(PID_ADVANCED_CONFIG.gyroHighFsr)
                               .push8(PID_ADVANCED_CONFIG.gyroMovementCalibThreshold)
                               .push16(PID_ADVANCED_CONFIG.gyroCalibDuration)