Add compatibility/retry on notification streaming