diff --git a/occ_status.cpp b/occ_status.cpp
index 7d654b9..4b6e276 100644
--- a/occ_status.cpp
+++ b/occ_status.cpp
@@ -251,6 +251,10 @@
 {
     CmdStatus status = CmdStatus::SUCCESS;
 
+    // IPS data will get sent automatically after a mode change if the mode
+    // supports it.
+    pmode->needToSendIPS();
+
     status = pmode->sendModeChange();
     if (status != CmdStatus::SUCCESS)
     {
@@ -263,22 +267,6 @@
         // Disable and reset to try recovering
         deviceError();
     }
-
-    status = pmode->sendIpsData();
-    if (status != CmdStatus::SUCCESS)
-    {
-        log<level::ERR>(
-            std::format(
-                "Status::occsWentActive: Sending Idle Power Save Config data failed with status {}",
-                status)
-                .c_str());
-
-        if (status == CmdStatus::COMM_FAILURE)
-        {
-            // Disable and reset to try recovering
-            deviceError();
-        }
-    }
 }
 
 // Send Ambient and Altitude to the OCC