Do not notify if on demand (2)

Resf #1417