diff --git a/mission/controller/acs/control/SafeCtrl.cpp b/mission/controller/acs/control/SafeCtrl.cpp
index d8e97728..8ad8b578 100644
--- a/mission/controller/acs/control/SafeCtrl.cpp
+++ b/mission/controller/acs/control/SafeCtrl.cpp
@@ -26,10 +26,14 @@ acs::SafeModeStrategy SafeCtrl::safeCtrlStrategy(
       return acs::SafeModeStrategy::SAFECTRL_NO_SENSORS_FOR_CONTROL;
     }
   } else if (not sunDirValid) {
-    if (gyrEnabled and dampingEnabled and satRotRateValid) {
-      return acs::SafeModeStrategy::SAFECTRL_ECLIPSE_DAMPING_GYR;
-    } else if (not gyrEnabled and dampingEnabled and satRotRateValid and fusedRateTotalValid) {
-      return acs::SafeModeStrategy::SAFECTRL_ECLIPSE_DAMPING_SUSMGM;
+    if (dampingEnabled) {
+      if (gyrEnabled and satRotRateValid) {
+        return acs::SafeModeStrategy::SAFECTRL_ECLIPSE_DAMPING_GYR;
+      } else if (not gyrEnabled and satRotRateValid and fusedRateTotalValid) {
+        return acs::SafeModeStrategy::SAFECTRL_ECLIPSE_DAMPING_SUSMGM;
+      } else {
+        return acs::SafeModeStrategy::SAFECTRL_NO_SENSORS_FOR_CONTROL;
+      }
     } else if (not dampingEnabled and satRotRateValid) {
       return acs::SafeModeStrategy::SAFECTRL_ECLIPSE_IDELING;
     } else {