Fix double-start. Patiently wait for data.

Fixes ZEN-10600.