diff --git a/extended/code_update/update_bmc.robot b/extended/code_update/update_bmc.robot
index 6c22803..6d4ca55 100644
--- a/extended/code_update/update_bmc.robot
+++ b/extended/code_update/update_bmc.robot
@@ -41,7 +41,6 @@
     Run Keyword If   '${session_active}' == '${True}'
     ...    Trigger Warm Reset via Reboot
 
-    Wait Until Keyword Succeeds
-    ...  30 min   10 sec     Check If BMC is Up
+    Check If BMC is Up    30 min   10 sec
     Sleep  1 min
     Validate BMC Version