diff --git a/.github/workflows/sunnypilot-master-dev-prep.yaml b/.github/workflows/sunnypilot-master-dev-prep.yaml
index 36cfc2e7ee..1cb574764b 100644
--- a/.github/workflows/sunnypilot-master-dev-prep.yaml
+++ b/.github/workflows/sunnypilot-master-dev-prep.yaml
@@ -241,5 +241,3 @@ jobs:
           gh run watch "$RUN_ID"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/models.py b/selfdrive/ui/sunnypilot/layouts/settings/models.py
index 5820b34cc0..4fb579a0f2 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/models.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/models.py
@@ -99,7 +99,7 @@ class ModelsLayout(Widget):
               "Keeping this on provides the stock openpilot experience.")
     if lagd_toggle:
       desc += f"<br>{tr('Live Steer Delay:')} {ui_state.sm['liveDelay'].lateralDelay:.3f} s"
-    elif ui_state.CP:
+    elif ui_state.CP is not None:
       sw = float(ui_state.params.get("LagdToggleDelay", "0.2"))
       cp = ui_state.CP.steerActuatorDelay
       desc += f"<br>{tr('Actuator Delay:')} {cp:.2f} s + {tr('Software Delay:')} {sw:.2f} s = {tr('Total Delay:')} {cp + sw:.2f} s"
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/lane_change_settings.py b/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/lane_change_settings.py
index 9a5d5202a5..fbb9ce7cf7 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/lane_change_settings.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/lane_change_settings.py
@@ -75,7 +75,7 @@ class LaneChangeSettingsLayout(Widget):
     self._scroller.show_event()
 
   def _update_toggles(self):
-    enable_bsm = ui_state.CP and ui_state.CP.enableBsm
+    enable_bsm = ui_state.CP is not None and ui_state.CP.enableBsm
     if not enable_bsm and ui_state.params.get_bool("AutoLaneChangeBsmDelay"):
       ui_state.params.remove("AutoLaneChangeBsmDelay")
     self._bsm_delay.action_item.set_enabled(enable_bsm and ui_state.params.get("AutoLaneChangeTimer", return_default=True) > AutoLaneChangeMode.NUDGE)
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/mads_settings.py b/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/mads_settings.py
index 3542adf285..098fcf8ce8 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/mads_settings.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/steering_sub_layouts/mads_settings.py
@@ -91,12 +91,12 @@ class MadsSettingsLayout(Widget):
       if bundle:
         brand = bundle.get("brand", "")
     if not brand:
-      brand = ui_state.CP.brand if ui_state.CP else ""
+      brand = ui_state.CP.brand if ui_state.CP is not None else ""
 
     if brand == "rivian":
       return True
     elif brand == "tesla":
-      return not (ui_state.CP_SP and ui_state.CP_SP.flags & TeslaFlagsSP.HAS_VEHICLE_BUS)
+      return not (ui_state.CP_SP is not None and ui_state.CP_SP.flags & TeslaFlagsSP.HAS_VEHICLE_BUS)
     return False
 
   def _update_steering_mode_description(self, button_index: int):
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/__init__.py b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/__init__.py
index 0dd12d76f4..d8fdd61e72 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/__init__.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/__init__.py
@@ -35,7 +35,7 @@ class VehicleLayout(Widget):
   def get_brand():
     if bundle := ui_state.params.get("CarPlatformBundle"):
       return bundle.get("brand", "")
-    elif ui_state.CP and ui_state.CP.carFingerprint != "MOCK":
+    elif ui_state.CP is not None and ui_state.CP.carFingerprint != "MOCK":
       return ui_state.CP.brand
     return ""
 
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/hyundai.py b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/hyundai.py
index f6849eb201..351dacbbc2 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/hyundai.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/hyundai.py
@@ -32,7 +32,7 @@ class HyundaiSettings(BrandSettings):
     if bundle:
       platform = bundle.get("platform")
       self.alpha_long_available = CAR[platform] not in (UNSUPPORTED_LONGITUDINAL_CAR | CANFD_UNSUPPORTED_LONGITUDINAL_CAR)
-    elif ui_state.CP:
+    elif ui_state.CP is not None:
       self.alpha_long_available = ui_state.CP.alphaLongitudinalAvailable
 
     tuning_param = int(ui_state.params.get("HyundaiLongitudinalTuning") or "0")
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/subaru.py b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/subaru.py
index 66e7ec1d5a..5ef53a0e43 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/subaru.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/brands/subaru.py
@@ -39,7 +39,7 @@ class SubaruSettings(BrandSettings):
       platform = bundle.get("platform")
       config = CAR[platform].config
       self.has_stop_and_go = not (config.flags & (SubaruFlags.GLOBAL_GEN2 | SubaruFlags.HYBRID))
-    elif ui_state.CP:
+    elif ui_state.CP is not None:
       self.has_stop_and_go = not (ui_state.CP.flags & (SubaruFlags.GLOBAL_GEN2 | SubaruFlags.HYBRID))
 
     disabled_msg = self.stop_and_go_disabled_msg()
diff --git a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/platform_selector.py b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/platform_selector.py
index db90595274..517a7d9620 100644
--- a/selfdrive/ui/sunnypilot/layouts/settings/vehicle/platform_selector.py
+++ b/selfdrive/ui/sunnypilot/layouts/settings/vehicle/platform_selector.py
@@ -131,7 +131,7 @@ class PlatformSelector(Button):
       self._platform = bundle.get("name", "")
       self.set_text(self._platform)
       self.color = style.BLUE
-    elif ui_state.CP and ui_state.CP.carFingerprint != "MOCK":
+    elif ui_state.CP is not None and ui_state.CP.carFingerprint != "MOCK":
       self._platform = ui_state.CP.carFingerprint
       self.set_text(self._platform)
       self.color = style.GREEN