diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index de2ff70..9696b1a 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
@@ -15,6 +15,7 @@
 ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i off
 ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on
 ExecStart=/bin/rm -f /run/openbmc/host@%i-on
+ExecStart=/bin/rm -f /run/openbmc/host@%i-request
 
 [Install]
 WantedBy=obmc-host-stop@%i.target
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
index d1a814f..2f61b07 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
@@ -4,6 +4,7 @@
 After=mapper-wait@-org-openbmc-HostIpmi-1.service
 Wants=obmc-host-stopping@0.target
 Before=obmc-host-stopping@0.target
+ConditionPathExists=!/run/openbmc/host@0-request
 
 [Service]
 Restart=no