diff --git a/system/ui/lib/wifi_manager_v2.py b/system/ui/lib/wifi_manager_v2.py
index 2704a05e9d..4f8f4774a1 100644
--- a/system/ui/lib/wifi_manager_v2.py
+++ b/system/ui/lib/wifi_manager_v2.py
@@ -144,13 +144,10 @@ class WifiManager:
     self._bus.close()
 
   def _run(self):
-    while True:
+    while self._running:
       if self._active:
         self._update_networks()
 
-      if not self._running:
-        break
-
       time.sleep(1)
 
   def set_active(self, active: bool):
@@ -290,6 +287,9 @@ class WifiManager:
 
       try:
         ap = AccessPoint.from_dbus(ap_props, ap_path, active_ap_path)
+        if ap.ssid == "":
+          continue
+
         if ap.ssid not in aps:
           aps[ap.ssid] = []