diff --git a/extended/code_update/update_bmc.robot b/extended/code_update/update_bmc.robot
index b4e44e3..92ceeb7 100644
--- a/extended/code_update/update_bmc.robot
+++ b/extended/code_update/update_bmc.robot
@@ -59,8 +59,10 @@
 
     Activate BMC flash image
 
-    # TODO: openbmc/openbmc#519
     Run Keyword And Ignore Error    Trigger Warm Reset
+    # Warm reset adds 3 seconds delay before forcing reboot
+    # To minimize race conditions, we wait for 7 seconds
+    Sleep  7s
     ${session_active}=   Check If warmReset is Initiated
     Run Keyword If   '${session_active}' == '${True}'
     ...    Trigger Warm Reset via Reboot