diff --git a/modules/misc/dconf.nix b/modules/misc/dconf.nix
index 3770062d1..e75b30972 100644
--- a/modules/misc/dconf.nix
+++ b/modules/misc/dconf.nix
@@ -76,13 +76,13 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable (
-    {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       home.packages = [ pkgs.dconf ];
       dbus.packages = [ pkgs.dconf ];
       home.sessionVariables.GIO_EXTRA_MODULES = "${pkgs.dconf.lib}/lib/gio/modules";
-    }
-    // lib.mkIf (cfg.settings != { }) {
+    })
+    (lib.mkIf (cfg.enable && cfg.settings != { }) {
       # Make sure the dconf directory exists.
       xdg.configFile."dconf/.keep".source = builtins.toFile "keep" "";
 
@@ -147,6 +147,6 @@ in
           unset DCONF_DBUS_RUN_SESSION
         ''
       );
-    }
-  );
+    })
+  ];
 }
diff --git a/tests/modules/home-environment/session-variables.nix b/tests/modules/home-environment/session-variables.nix
index 957fb019e..9e01bb94a 100644
--- a/tests/modules/home-environment/session-variables.nix
+++ b/tests/modules/home-environment/session-variables.nix
@@ -9,6 +9,7 @@ let
     if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
     export __HM_SESS_VARS_SOURCED=1
 
+    export GIO_EXTRA_MODULES="${pkgs.dconf}/lib/gio/modules"
     export LOCALE_ARCHIVE_2_27="${config.i18n.glibcLocales}/lib/locale/locale-archive"
     export V1="v1"
     export V2="v2-v1"