diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 0b92462ee3e..2f1382ac93c 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -62,8 +62,8 @@ rec {
   selectDeclsAndDefs = modules:
     lib.concatMap (m:
       if m ? config || m ? options then
-         attrByPath ["options"] [] m
-      ++ attrByPath ["config"] [] m
+         [ (attrByPath ["options"] {} m) ]
+      ++ [ (attrByPath ["config"] {} m) ]
       else
         [ m ]
     ) modules;