diff --git a/release/build_release3.sh b/release/build_release3.sh
index 65879e7063..f02069d6bd 100755
--- a/release/build_release3.sh
+++ b/release/build_release3.sh
@@ -97,10 +97,9 @@ if [ ! -z "$PUSH" ]; then
   git push -f origin release3-staging
 
   # Create dashcam
-  git rm selfdrive/car/*/carcontroller.py
-
-  git commit -m "create dashcam release from release"
-  git push -f origin release3-staging:dashcam3-staging
+  #git rm selfdrive/car/*/carcontroller.py
+  #git commit -m "create dashcam release from release"
+  #git push -f origin release3-staging:dashcam3-staging
 fi
 
 echo "[-] done T=$SECONDS"
diff --git a/selfdrive/thermald/thermald.py b/selfdrive/thermald/thermald.py
index 83866297d7..c9b9c09752 100755
--- a/selfdrive/thermald/thermald.py
+++ b/selfdrive/thermald/thermald.py
@@ -356,13 +356,13 @@ def thermald_thread():
     # controls will warn with CPU above 95 or battery above 60
     startup_conditions["device_temp_good"] = thermal_status < ThermalStatus.danger
     set_offroad_alert_if_changed("Offroad_TemperatureTooHigh", (not startup_conditions["device_temp_good"]))
-    should_start = all(startup_conditions.values())
 
     startup_conditions["hardware_supported"] = health is not None and health.health.hwType not in [log.HealthData.HwType.whitePanda,
                                                                                                    log.HealthData.HwType.greyPanda]
     set_offroad_alert_if_changed("Offroad_HardwareUnsupported", health is not None and not startup_conditions["hardware_supported"])
 
     # Handle offroad/onroad transition
+    should_start = all(startup_conditions.values())
     if should_start:
       if not should_start_prev:
         params.delete("IsOffroad")