diff --git a/discover_system_state.cpp b/discover_system_state.cpp
index 29abdc6..a529a0a 100644
--- a/discover_system_state.cpp
+++ b/discover_system_state.cpp
@@ -69,6 +69,18 @@
 
     // This application is only run if chassis power is off
 
+    // If the BMC was rebooted due to a user initiated pinhole reset, do not
+    // implement any power restore policies
+    auto bmcRebootCause = phosphor::state::manager::utils::getProperty(
+        bus, "/xyz/openbmc_project/state/bmc0", BMC_BUSNAME, "LastRebootCause");
+    if (bmcRebootCause ==
+        "xyz.openbmc_project.State.BMC.RebootCause.PinholeReset")
+    {
+        info(
+            "BMC was reset due to pinhole reset, no power restore policy will be run");
+        return 0;
+    }
+
     /* The logic here is to first check the one-time PowerRestorePolicy setting.
      * If this property is not the default then look at the persistent
      * user setting in the non one-time object, otherwise honor the one-time
diff --git a/service_files/phosphor-discover-system-state@.service b/service_files/phosphor-discover-system-state@.service
index 6b966f0..4fbb186 100644
--- a/service_files/phosphor-discover-system-state@.service
+++ b/service_files/phosphor-discover-system-state@.service
@@ -6,6 +6,8 @@
 After=mapper-wait@-xyz-openbmc_project-state-host%i.service
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
+Wants=mapper-wait@-xyz-openbmc_project-state-bmc%i.service
+After=mapper-wait@-xyz-openbmc_project-state-bmc%i.service
 After=op-reset-chassis-on@%i.service
 ConditionPathExists=!/run/openbmc/chassis@%i-on