diff --git a/lib/modules.nix b/lib/modules.nix
index fb3cfd9a0742..938b17bd3b92 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -564,7 +564,8 @@ let
         modulesPath:
         { disabled, modules }:
         let
-          keyFilter = filter (attrs: !isDisabled modulesPath disabled attrs);
+          isDisabledModule = isDisabled modulesPath disabled;
+          keyFilter = filter (attrs: !isDisabledModule attrs);
         in
         catAttrs "module" (genericClosure {
           startSet = keyFilter modules;