diff --git a/common/pc/laptop/default.nix b/common/pc/laptop/default.nix
index 309e999..9121b5f 100644
--- a/common/pc/laptop/default.nix
+++ b/common/pc/laptop/default.nix
@@ -6,5 +6,6 @@
   # Gnome 40 introduced a new way of managing power, without tlp.
   # However, these 2 services clash when enabled simultaneously.
   # https://github.com/NixOS/nixos-hardware/issues/260
-  services.tlp.enable = lib.mkDefault (!config.services.power-profiles-daemon.enable);
+  services.tlp.enable = lib.mkDefault ((lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
+                                       || !config.services.power-profiles-daemon.enable);
 }