Fix #164 by always setting a timeout for notification updates