diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6d88025..d71df6e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+
+- PL Enable set of the power controller is now set to invalid properly
+  if the power controller is not in normal mode.
+
 # [v7.1.0] 2023-10-11
 
 - Bumped `eive-tmtc` to v5.8.0.
diff --git a/mission/controller/PowerController.cpp b/mission/controller/PowerController.cpp
index 7b7db9e8..2a735782 100644
--- a/mission/controller/PowerController.cpp
+++ b/mission/controller/PowerController.cpp
@@ -100,15 +100,16 @@ void PowerController::performControlOperation() {
       return;
     }
     case InternalState::READY: {
+      if (mode != MODE_NORMAL) {
+        PoolReadGuard pg(&enablePl);
+        if (pg.getReadResult() == returnvalue::OK) {
+          enablePl.setValidity(false, true);
+        }
+      }
       if (mode != MODE_OFF) {
         calculateStateOfCharge();
         if (mode == MODE_NORMAL) {
           watchStateOfCharge();
-        } else {
-          PoolReadGuard pg(&enablePl);
-          if (pg.getReadResult() == returnvalue::OK) {
-            enablePl.setValidity(false, true);
-          }
         }
       }
       break;