diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index 5245846..d612d61 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -12,6 +12,7 @@
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i on
+TimeoutSec=30
 
 [Install]
 WantedBy=obmc-chassis-start@%i.target