diff --git a/system/ui/setup.py b/system/ui/setup.py
index 8f783639f7..a985e783be 100755
--- a/system/ui/setup.py
+++ b/system/ui/setup.py
@@ -72,8 +72,7 @@ class Setup(Widget):
     self.download_url = ""
     self.download_progress = 0
     self.download_thread = None
-    self.wifi_manager = WifiManager()
-    self.wifi_ui = WifiManagerUI(self.wifi_manager)
+    self.wifi_ui = WifiManagerUI(WifiManager())
     self.keyboard = Keyboard()
     self.selected_radio = None
     self.warning = gui_app.texture("icons/warning.png", 150, 150)
diff --git a/system/ui/updater.py b/system/ui/updater.py
index 731e766f8c..b3cdc82cf5 100755
--- a/system/ui/updater.py
+++ b/system/ui/updater.py
@@ -43,8 +43,7 @@ class Updater(Widget):
     self.show_reboot_button = False
     self.process = None
     self.update_thread = None
-    self.wifi_manager = WifiManager()
-    self.wifi_manager_ui = WifiManagerUI(self.wifi_manager)
+    self.wifi_manager_ui = WifiManagerUI(WifiManager())
 
   def install_update(self):
     self.current_screen = Screen.PROGRESS