diff --git a/lib/inventory/build-inventory/default.nix b/lib/inventory/build-inventory/default.nix
index 5e39cee37..acb4756ef 100644
--- a/lib/inventory/build-inventory/default.nix
+++ b/lib/inventory/build-inventory/default.nix
@@ -63,6 +63,7 @@ let
         ++ (lib.foldlAttrs (
           # [ Modules ], String, ServiceConfig
           acc2: instanceName: serviceConfig:
+
           let
             resolvedRoles = builtins.mapAttrs (
               roleName: members:
@@ -119,8 +120,9 @@ let
               globalExtraModules ++ machineExtraModules ++ roleServiceExtraModules
             );
           in
-
-          if isInService then
+          if !serviceConfig.enabled then
+            acc2
+          else if isInService then
             acc2
             ++ [
               {