diff --git a/users/simon/modules/mpd.nix b/users/simon/modules/mpd.nix
index 83b4987..4b268f0 100644
--- a/users/simon/modules/mpd.nix
+++ b/users/simon/modules/mpd.nix
@@ -69,4 +69,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
   home.packages = with pkgs; [
     mpc_cli
   ];
+
+  home.sessionVariables.MPD_HOST = config.services.mpd.network.listenAddress;
 }
diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix
index 095eaec..b4b1b34 100644
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@@ -149,9 +149,9 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
         "XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
         "XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
 
-        "XF86AudioPrev" = "exec ${pkgs.mpc_cli}/bin/mpc --host=${config.services.mpd.network.listenAddress} next";
-        "XF86AudioNext" = "exec ${pkgs.mpc_cli}/bin/mpc --host=${config.services.mpd.network.listenAddress} prev";
-        "XF86AudioPlay" = "exec ${pkgs.mpc_cli}/bin/mpc --host=${config.services.mpd.network.listenAddress} toggle";
+        "XF86AudioPrev" = "exec ${pkgs.mpc_cli}/bin/mpc next";
+        "XF86AudioNext" = "exec ${pkgs.mpc_cli}/bin/mpc prev";
+        "XF86AudioPlay" = "exec ${pkgs.mpc_cli}/bin/mpc toggle";
 
         # Mumble PTT
         "--no-repeat Shift_R" = "exec ${pkgs.dbus}/bin/dbus-send --session --type=method_call --dest=net.sourceforge.mumble.mumble / net.sourceforge.mumble.Mumble.startTalking";
@@ -338,8 +338,8 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
         interval = 2;
         tooltip-format = "MPD (connected)";
         tooltip-format-disconnected = "MPD (disconnected)";
-        on-scroll-up = "${pkgs.mpc_cli}/bin/mpc -h ${config.services.mpd.dataDir}/socket volume +2";
-        on-scroll-down = "${pkgs.mpc_cli}/bin/mpc -h ${config.services.mpd.dataDir}/socket volume -2";
+        on-scroll-up = "${pkgs.mpc_cli}/bin/mpc volume +2";
+        on-scroll-down = "${pkgs.mpc_cli}/bin/mpc volume -2";
         consume-icons = {
           on = " ";
         };