diff --git a/configuration/sample-development.engine.ini b/configuration/sample-development.engine.ini
index 84bef0ea0d9b12b5604df08358c0c04d83244d4f..cd4fe86275a88c23e3099a97421114026324cfdb 100644
--- a/configuration/sample-development.engine.ini
+++ b/configuration/sample-development.engine.ini
@@ -73,6 +73,7 @@ preload_offset=60
 # overall playout, it's delays and possible fallbacks
 stream_connect_retry_delay=1
 stream_connect_max_retries=10
+input_stream_buffer=3.0
 
 # sets the time how long we have to fade in and out, when we select another mixer input
 # values are in seconds
diff --git a/configuration/sample-docker.engine.ini b/configuration/sample-docker.engine.ini
index 5c29d3215a317b64790a9e2b7d5ed8c8c94f921c..7df831c27e69aeebe6f8f0bbbc1452744f0dfa1f 100644
--- a/configuration/sample-docker.engine.ini
+++ b/configuration/sample-docker.engine.ini
@@ -73,6 +73,7 @@ preload_offset=60
 # overall playout, it's delays and possible fallbacks
 stream_connect_retry_delay=1
 stream_connect_max_retries=10
+input_stream_buffer=3.0
 
 # sets the time how long we have to fade in and out, when we select another mixer input
 # values are in seconds
diff --git a/configuration/sample-production.engine.ini b/configuration/sample-production.engine.ini
index 1fceda6379ca9ba031a7d6d53dc819cf56e34310..d2d7be2c8d5b69da5609d15f7fefea4b9aaa7d9d 100644
--- a/configuration/sample-production.engine.ini
+++ b/configuration/sample-production.engine.ini
@@ -73,6 +73,7 @@ preload_offset=60
 # overall playout, it's delays and possible fallbacks
 stream_connect_retry_delay=1
 stream_connect_max_retries=10
+input_stream_buffer=3.0
 
 # sets the time how long we have to fade in and out, when we select another mixer input
 # values are in seconds
diff --git a/modules/liquidsoap/in_stream.liq b/modules/liquidsoap/in_stream.liq
index 13a207516ad16b266b4e121780cde4ed18751ba6..bca49abbf70b397f15edab315089d509cd37ad9c 100644
--- a/modules/liquidsoap/in_stream.liq
+++ b/modules/liquidsoap/in_stream.liq
@@ -38,10 +38,10 @@ https_starturl = "https://securestream.o94.at/live.mp3"
 
 
 
-input_http_0 = input.http(id="in_http_0", buffer=3.0, max=60.0, timeout=60.0, autostart=false, http_starturl)
-input_http_1 = input.http(id="in_http_1", buffer=3.0, max=60.0, timeout=60.0, autostart=false, http_starturl)
-input_https_0 = input.https(id="in_https_0", buffer=3.0, max=60.0, timeout=60.0, autostart=false, https_starturl)
-input_https_1 = input.https(id="in_https_1", buffer=3.0, max=60.0, timeout=60.0, autostart=false, https_starturl)
+input_http_0 = input.http(id="in_http_0", buffer=input_stream_buffer, max=60.0, timeout=60.0, autostart=false, http_starturl)
+input_http_1 = input.http(id="in_http_1", buffer=input_stream_buffer, max=60.0, timeout=60.0, autostart=false, http_starturl)
+input_https_0 = input.https(id="in_https_0", buffer=input_stream_buffer, max=60.0, timeout=60.0, autostart=false, https_starturl)
+input_https_1 = input.https(id="in_https_1", buffer=input_stream_buffer, max=60.0, timeout=60.0, autostart=false, https_starturl)
 
 # Route input stream to an dummy output to avoid buffer-overrun messages
 # output.dummy(id="SPAM_HTTP_OUTPUT_0", fallible=true, input_http_0)
diff --git a/modules/liquidsoap/settings.liq b/modules/liquidsoap/settings.liq
index 7ea1117131257b17739ad7a1230aa33df2044b02..4e284752daa0efcca14c89d77511b016369ed733 100644
--- a/modules/liquidsoap/settings.liq
+++ b/modules/liquidsoap/settings.liq
@@ -59,6 +59,8 @@ a2_out = list.assoc(default="", "output_device_2", ini)
 a3_out = list.assoc(default="", "output_device_3", ini)
 a4_out = list.assoc(default="", "output_device_4", ini)
 
+input_stream_buffer = float_of_string(list.assoc(default="3.0", "input_stream_buffer", ini))
+
 # FALLBACK SETTINGS
 fallback_max_blank = float_of_string(list.assoc(default="", "fallback_max_blank", ini))
 fallback_min_noise = float_of_string(list.assoc(default="", "fallback_min_noise", ini))