Fix on demand state for non applications

Refs #1442