diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index a891c3187a..7e6d3055d5 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -389,12 +389,12 @@ void setAccelerationCalibrationValues(flightDynamicsTrims_t * accZeroToUse, flig
     accZero = accZeroToUse;
     accGain = accGainToUse;
 
-    if ((accZero->raw[X] != 0) && (accZero->raw[Y] != 0) && (accZero->raw[Z] != 0) &&
-        (accGain->raw[X] != 4096) && (accGain->raw[Y] != 4096) &&(accGain->raw[Z] != 4096)) {
-        ENABLE_STATE(ACCELEROMETER_CALIBRATED);
+    if ((accZero->raw[X] == 0) && (accZero->raw[Y] == 0) && (accZero->raw[Z] == 0) &&
+        (accGain->raw[X] == 4096) && (accGain->raw[Y] == 4096) &&(accGain->raw[Z] == 4096)) {
+        DISABLE_STATE(ACCELEROMETER_CALIBRATED);
     }
     else {
-        DISABLE_STATE(ACCELEROMETER_CALIBRATED);
+        ENABLE_STATE(ACCELEROMETER_CALIBRATED);
     }
 }
 
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index 5ac5f594fe..431292649f 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -205,11 +205,11 @@ void compassUpdate(timeUs_t currentTimeUs, flightDynamicsTrims_t *magZero)
     static int16_t magPrev[XYZ_AXIS_COUNT];
 
     // Check magZero
-    if ((magZero->raw[X] != 0) && (magZero->raw[Y] != 0) && (magZero->raw[Z] != 0)) {
-        ENABLE_STATE(COMPASS_CALIBRATED);
+    if ((magZero->raw[X] == 0) && (magZero->raw[Y] == 0) && (magZero->raw[Z] == 0)) {
+        DISABLE_STATE(COMPASS_CALIBRATED);
     }
     else {
-        DISABLE_STATE(COMPASS_CALIBRATED);
+        ENABLE_STATE(COMPASS_CALIBRATED);
     }
 
     if (!mag.dev.read(magADCRaw)) {