diff --git a/templates/mpd.j2 b/templates/mpd.j2
index 3006844..ed7f1ad 100644
--- a/templates/mpd.j2
+++ b/templates/mpd.j2
@@ -76,13 +76,6 @@ port				"{{ mpd_port }}"
 #
 auto_update    "yes"
 
-# Input #######################################################################
-#
-
-input {
-        plugin "curl"
-}
-
 #
 ###############################################################################
 
@@ -94,17 +87,20 @@ input {
 # autodetection for one sound card.
 #
 
+# Use a fixed format for the HTTP stream because it cannot switch its audio 
+# format on-the-fly when the song changes.
+# see https://mpd.readthedocs.io/en/latest/plugins.html#httpd
 audio_output {
        type            "httpd"
        name            "HTTP Stream"
        encoder         "opus"
        port            "{{ mpd_http_stream_port }}"
        bind_to_address "{{ vpn_listen_address }}"
-       bitrate         "auto"
-       allowed_formats "96000:24:2 44800:24:2 44800:16:2 44100:16:2"
+       bitrate         "128000"
+       format          "48000:16:1"
        always_on       "yes"
-       tags             "yes"
-       max_clients      "0" # optional 0=no limit
+       tags            "yes"
+       max_clients     "0"
 }