diff --git a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
index 7178d93..d28bfe8 100644
--- a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
+++ b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
@@ -5,6 +5,7 @@
 Wants=mapper-wait@-org-openbmc-watchdog-host%i.service
 After=mapper-wait@-org-openbmc-watchdog-host%i.service
 Conflicts=obmc-chassis-stop@%i.target
+ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
 Type=oneshot
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
index 6445155..8c5cfbb 100644
--- a/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
+++ b/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
@@ -9,6 +9,7 @@
 Wants=mapper-wait@-org-openbmc-control-host%i.service
 After=mapper-wait@-org-openbmc-control-host%i.service
 Conflicts=obmc-chassis-stop@%i.target
+ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
 Type=oneshot