diff --git a/op-enter-mpreboot@.service.in b/op-enter-mpreboot@.service.in
index 635328f..0455298 100644
--- a/op-enter-mpreboot@.service.in
+++ b/op-enter-mpreboot@.service.in
@@ -2,7 +2,7 @@
 Description=Start memory preserving reboot host%i
 Wants=obmc-host-stopped@%i.target
 After=obmc-host-stopped@%i.target
-After=op-stop-instructions@%i.service
+Before=op-stop-instructions@%i.service
 After=phosphor-reset-sensor-states@%i.service
 Before=phosphor-reboot-host@%i.service
 Conflicts=obmc-host-startmin@%i.target
diff --git a/op-stop-instructions@.service.in b/op-stop-instructions@.service.in
index e13a606..fd45279 100644
--- a/op-stop-instructions@.service.in
+++ b/op-stop-instructions@.service.in
@@ -6,6 +6,7 @@
 After=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
 Conflicts=obmc-host-startmin@%i.target
 ConditionPathExists=/sys/class/fsi-master/fsi0/slave@00:00/cfam_id
+ConditionPathExists=!/run/openbmc/mpreboot@%i
 
 [Service]
 RemainAfterExit=yes