diff --git a/selfdrive/ui/sunnypilot/ui_state.py b/selfdrive/ui/sunnypilot/ui_state.py
index fe90e3bdf..ac08538df 100644
--- a/selfdrive/ui/sunnypilot/ui_state.py
+++ b/selfdrive/ui/sunnypilot/ui_state.py
@@ -23,7 +23,10 @@ class UIStateSP:
     self.sunnylink_state = SunnylinkState()
 
   def update(self) -> None:
-    self.sunnylink_state.start()
+    if self.sunnylink_enabled:
+      self.sunnylink_state.start()
+    else:
+      self.sunnylink_state.stop()
 
   @staticmethod
   def update_status(ss, ss_sp, onroad_evt) -> str:
diff --git a/sunnypilot/sunnylink/sunnylink_state.py b/sunnypilot/sunnylink/sunnylink_state.py
index 13b5ad81e..efdfa7071 100644
--- a/sunnypilot/sunnylink/sunnylink_state.py
+++ b/sunnypilot/sunnylink/sunnylink_state.py
@@ -136,10 +136,11 @@ class SunnylinkState:
       token = self._api.get_token()
       response = self._api.api_get(f"device/{self.sunnylink_dongle_id}/roles", method='GET', access_token=token)
       if response.status_code == 200:
-        self._roles = _parse_roles(response.text)
-        self._params.put("SunnylinkCache_Roles", response.text)
-        sponsor_tier = self._get_highest_tier()
+        roles = response.text
+        self._params.put("SunnylinkCache_Roles", roles)
         with self._lock:
+          self._roles = _parse_roles(roles)
+          sponsor_tier = self._get_highest_tier()
           if sponsor_tier != self.sponsor_tier:
             self.sponsor_tier = sponsor_tier
             cloudlog.info(f"Sunnylink sponsor tier updated to {sponsor_tier.name}")
@@ -157,7 +158,7 @@ class SunnylinkState:
         users = response.text
         self._params.put("SunnylinkCache_Users", users)
         with self._lock:
-          _parse_users(users)
+          self._users = _parse_users(users)
     except Exception as e:
       cloudlog.exception(f"Failed to fetch sunnylink users: {e} for dongle id {self.sunnylink_dongle_id}")