diff --git a/lib/inventory/build-inventory/default.nix b/lib/inventory/build-inventory/default.nix
index 003c0c654..eac2416ae 100644
--- a/lib/inventory/build-inventory/default.nix
+++ b/lib/inventory/build-inventory/default.nix
@@ -189,7 +189,7 @@ let
           ) [ ] inventory.services;
         }
       ]
-    ) inventory.machines;
+    ) (inventory.machines or { });
 in
 {
   inherit buildInventory;
diff --git a/lib/inventory/tests/default.nix b/lib/inventory/tests/default.nix
index e48768f8d..faab5eda9 100644
--- a/lib/inventory/tests/default.nix
+++ b/lib/inventory/tests/default.nix
@@ -88,9 +88,9 @@ in
         not_used_machine = builtins.length configs.not_used_machine;
       };
       expected = {
-        client_1_machine = 5;
-        client_2_machine = 5;
-        not_used_machine = 2;
+        client_1_machine = 6;
+        client_2_machine = 6;
+        not_used_machine = 3;
       };
     };