diff --git a/chassis_state_manager.cpp b/chassis_state_manager.cpp
index d970e58..d9eb78c 100644
--- a/chassis_state_manager.cpp
+++ b/chassis_state_manager.cpp
@@ -15,7 +15,7 @@
 #include <sdeventplus/event.hpp>
 #include <sdeventplus/exception.hpp>
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 
 namespace phosphor
@@ -54,6 +54,8 @@
 constexpr auto SYSTEMD_PROPERTY_IFACE = "org.freedesktop.DBus.Properties";
 constexpr auto SYSTEMD_INTERFACE_UNIT = "org.freedesktop.systemd1.Unit";
 
+constexpr auto CHASSIS_ON_FILE = "/run/openbmc/chassis@%d-on";
+
 void Chassis::subscribeToSystemdSignals()
 {
     try
@@ -237,6 +239,20 @@
         log<level::INFO>("Received signal that power ON is complete");
         this->currentPowerState(server::Chassis::PowerState::On);
         this->setStateChangeTime();
+
+        // Remove temporary file which is utilized for scenarios where the
+        // BMC is rebooted while the chassis power is still on.
+        // This file is used to indicate to chassis related systemd services
+        // that the chassis is already on and they should skip running.
+        // Once the chassis state is back to on we can clear this file.
+        auto size = std::snprintf(nullptr, 0, CHASSIS_ON_FILE, 0);
+        size++; // null
+        std::unique_ptr<char[]> chassisFile(new char[size]);
+        std::snprintf(chassisFile.get(), size, CHASSIS_ON_FILE, 0);
+        if (std::filesystem::exists(chassisFile.get()))
+        {
+            std::filesystem::remove(chassisFile.get());
+        }
     }
 
     return 0;