MSS-26 event update timeout fix