diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
index 7deff9a..f9c7701 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
@@ -1,9 +1,11 @@
 [Unit]
 Description=Turn off AC at Sled%i
 Conflicts=chassis-poweron@%i.service
+Conflicts=phosphor-discover-system-state@%i.service
 After=host-poweroff@%i.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/sbin/power-ctrl sled%i ac-off
 SyslogIdentifier=power-ctrl
+StartLimitBurst=0
\ No newline at end of file
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
index 2f5f67b..d58ebf0 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
@@ -8,7 +8,8 @@
 Type=oneshot
 ExecStart=/usr/sbin/power-ctrl sled%i ac-on
 SyslogIdentifier=power-ctrl
-ExecStartPost=/bin/systemctl restart phosphor-discover-system-state@%i.service
+ExecStartPost=/bin/systemctl start phosphor-discover-system-state@%i.service
+StartLimitBurst=0
 
 [Install]
 WantedBy=multi-user.target