Fix to being stuck on "waiting..."

Fix to being stuck on "waiting..."