diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py
index f0a6ea4..67495ad 100644
--- a/selfdrive/car/hyundai/carstate.py
+++ b/selfdrive/car/hyundai/carstate.py
@@ -296,10 +296,10 @@ class CarState(CarStateBase):
       self.hda2_lfa_block_msg = copy.copy(cp_cam.vl["CAM_0x362"] if self.CP.flags & HyundaiFlags.CANFD_HDA2_ALT_STEERING
                                           else cp_cam.vl["CAM_0x2a4"])
 
-    if self.CP.nav_msg:
-      SpeedLimitController.load_state()
-      SpeedLimitController.car_speed_limit = self.calculate_speed_limit_canfd(self.CP, cp, cp_cam) * speed_conv
-      SpeedLimitController.write_car_state()
+    # Maybe a try catch?
+    SpeedLimitController.load_state()
+    SpeedLimitController.car_speed_limit = self.calculate_speed_limit_canfd(self.CP, cp, cp_cam) * speed_conv
+    SpeedLimitController.write_car_state()
 
     self.custom_speed_up = False
     self.custom_speed_down = False
@@ -472,7 +472,7 @@ class CarState(CarStateBase):
         ("SCC_CONTROL", 50),
       ]
 
-    if CP.nav_msg:
-      messages.append(("CLUSTER_SPEED_LIMIT", 10))
+    # if CP.nav_msg:
+    messages.append(("CLUSTER_SPEED_LIMIT", 10))
 
     return CANParser(DBC[CP.carFingerprint]["pt"], messages, CanBus(CP).CAM)
diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py
index 1992743..6aa2cc2 100644
--- a/selfdrive/car/hyundai/interface.py
+++ b/selfdrive/car/hyundai/interface.py
@@ -291,12 +291,12 @@ class CarInterface(CarInterfaceBase):
     ret.longitudinalActuatorDelayUpperBound = 0.5
 
     # *** feature detection ***
-    if candidate in CANFD_CAR:
-      ret.enableBsm = 0x1e5 in fingerprint[CAN.ECAN]
-      ret.nav_msg = 0x544 in fingerprint[0]
-    else:
-      ret.enableBsm = 0x58b in fingerprint[0]
-      ret.nav_msg = False
+    # if candidate in CANFD_CAR:
+    #   ret.enableBsm = 0x1e5 in fingerprint[CAN.ECAN]
+    #   ret.nav_msg = 0x544 in fingerprint[0]
+    # else:
+    #   ret.enableBsm = 0x58b in fingerprint[0]
+    #   ret.nav_msg = False
       
     # *** panda safety config ***
     ret.safetyConfigs = set_safety_config_hyundai(candidate, CAN, can_fd=(candidate in CANFD_CAR))