diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index 3bc20d981..31c581560 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -166,10 +166,14 @@ in
     mkIf cfg.enable {
       home = {
         packages = [ cfg.package ];
-        sessionVariables = mkIf cfg.enableSessionVariables {
-          MPD_HOST = mkIf (cfg.network.listenAddress != "any") cfg.network.listenAddress;
-          MPD_PORT = builtins.toString cfg.network.port;
-        };
+        sessionVariables = mkIf cfg.enableSessionVariables (
+          {
+            MPD_PORT = builtins.toString cfg.network.port;
+          }
+          // lib.optionalAttrs (cfg.network.listenAddress != "any") {
+            MPD_HOST = cfg.network.listenAddress;
+          }
+        );
       };
 
       services.mpd = lib.mkMerge [