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 ad2b8b2..de2ff70 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
@@ -3,6 +3,8 @@
 Before=obmc-power-off@%i.target
 Wants=obmc-power-stop@%i.target
 Before=obmc-power-stop@%i.target
+Wants=obmc-power-stop-pre@%i.target
+After=obmc-power-stop-pre@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
 Conflicts=obmc-chassis-poweron@%i.target