Fix provider discovery to wait for one provider

Fix provider discovery to wait for one provider