diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 6490426c38..3ee927f1e6 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -124,12 +124,16 @@ Butler::setup_request_pipe ()
 int
 Butler::start_thread()
 {
-	const float rate = (float)_session.frame_rate();
-
+    Diskstream::set_buffering_parameters (Config->get_buffering_preset());
+    
 	/* size is in Samples, not bytes */
+    const float rate = (float)_session.frame_rate();
 	audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * rate);
 	audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * rate);
-
+    
+    _session.adjust_capture_buffering ();
+    _session.adjust_playback_buffering ();
+    
 	/* size is in bytes
 	 * XXX: Jack needs to tell us the MIDI buffer size
 	 * (i.e. how many MIDI bytes we might see in a cycle)