diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index af3d170f..47d5ee9a 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -19,18 +19,24 @@ let
     // {
       override = args: drv.override (builtins.removeAttrs args [ "nix" ]);
     };
+
+  inherit (prev) lib;
 in
-{
+lib.optionalAttrs (prev ? nixos-rebuild) {
   nixos-rebuild = keepNixOverride (
     prev.nixos-rebuild.override {
       nix = nix-monitored;
     }
   );
+}
+// lib.optionalAttrs (prev ? nixos-rebuild-ng) {
   nixos-rebuild-ng = keepNixOverride (
     prev.nixos-rebuild-ng.override {
       nix = nix-monitored;
     }
   );
+}
+// {
   nix-direnv = prev.nix-direnv.override {
     nix = nix-monitored;
   };