Fixed queue wait timer not getting reset in some cases