Fix for #8670

We should only update the wait timeout on mis-matched event if we had a timeout to begin with