Do not notify when on demand

Refs #1417