diff --git a/hardware/intel/cpu.nix b/hardware/intel/cpu.nix
index 85701e3..2986b4e 100644
--- a/hardware/intel/cpu.nix
+++ b/hardware/intel/cpu.nix
@@ -10,14 +10,14 @@ in {
     };
 
     services.throttled.enable = generalCfg.unsafeOptimizations;
-    services.thermald.enable = !generalCfg.unsafeOptimizations;
+    services.thermald.enable = true;
 
     systemd.services.${throttledService} = {
       bindsTo = [ "ac-power.target" ];
       conflicts = [ "thermald.service" ];
     };
 
-    systemd.services.thermald = {
+    systemd.services.thermald = mkIf config.services.thermald.enable {
       wantedBy = [ "battery-power.target" ];
     };
   };