diff --git a/bin/pwnagotchi b/bin/pwnagotchi
index dc6015ad..cfafc990 100755
--- a/bin/pwnagotchi
+++ b/bin/pwnagotchi
@@ -60,8 +60,10 @@ def pwnagotchi_cli():
                 channels = agent.get_access_points_by_channel()
                 # for each channel
                 for ch, aps in channels:
-                    time.sleep(0.5)
-                    agent.set_channel(ch)
+                    while True:
+                        agent.set_channel(ch)
+                        if agent.get_current_channel() == ch:
+                            break
 
                     if not agent.is_stale() and agent.any_activity():
                         logging.info("%d access points on channel %d" % (len(aps), ch))