diff --git a/system/ui/lib/wifi_manager.py b/system/ui/lib/wifi_manager.py
index 22163d5f6..a030f7668 100644
--- a/system/ui/lib/wifi_manager.py
+++ b/system/ui/lib/wifi_manager.py
@@ -210,15 +210,16 @@ class WifiManager:
     def worker():
       self._wait_for_wifi_device()
 
+      # TODO: wait for state thread to start before adding tethering connection, tiny race currently
+      self._scan_thread.start()
+      self._state_thread.start()
+
       self._init_connections()
       if Params is not None and self._tethering_ssid not in self._connections:
         self._add_tethering_connection()
 
       self._init_wifi_state()
 
-      self._scan_thread.start()
-      self._state_thread.start()
-
       self._tethering_password = self._get_tethering_password()
       cloudlog.debug("WifiManager initialized")