Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r5a58fd72ededee8a718098b53448a2c921c57f49 -r5645305f9349c5c64be5560982bdf1abd5edb0fb
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5a58fd72ededee8a718098b53448a2c921c57f49)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5645305f9349c5c64be5560982bdf1abd5edb0fb)
@@ -19,12 +19,11 @@
 
 // ********** private definitions **********
 
-#define WAIT_FOR_UPDATE_FROM_UI_MS                  1000                         ///< Wait for update timeout in milliseconds.
+#define WAIT_FOR_UPDATE_FROM_UI_MS                  3000                            ///< Wait for update timeout in milliseconds.
 
 // ********** private data **********
 
 static MODE_STANDBY_STATE_T standbyCurrentState;                                    ///< Standby current state.
-static U32 waitForUpdateMsgStartTimeMS;                                             ///< Wait for update start time in milliseconds.
 
 // ********** private function prototypes **********
 
@@ -38,13 +37,12 @@
  * @brief
  * The initStandbyMode function initializes the standby mode.
  * @details \b Inputs: none
- * @details \b Outputs: standbyCurrentState, waitForUpdateMsgStartTimeMS
+ * @details \b Outputs: standbyCurrentState
  * @return none
  *************************************************************************/
 void initStandbyMode( void )
 {
-    standbyCurrentState         = STANDBY_CHECK_FOR_UPDATE_STATE;
-    waitForUpdateMsgStartTimeMS = getMSTimerCount();
+    standbyCurrentState = STANDBY_CHECK_FOR_UPDATE_STATE;
 }
 
 /*********************************************************************//**
@@ -129,7 +127,7 @@
             break;
     }
 
-    if ( TRUE == didTimeout( waitForUpdateMsgStartTimeMS, WAIT_FOR_UPDATE_FROM_UI_MS ) )
+    if ( TRUE == didTimeout( getLastBroadcastMessageTimeStampMS(), WAIT_FOR_UPDATE_FROM_UI_MS ) )
     {
         state = STANDBY_CHECK_FW_AND_FPGA_IMAGES_STATE;
     }