diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index 10e08cc6..63f05bb6 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -7,9 +7,12 @@
         <client-timeout>30</client-timeout>
         <header-timeout>15</header-timeout>
         <source-timeout>10</source-timeout>
-        <!-- This will provide a burst of data when a client first connects,
-             thereby significantly reducing the startup time for a listener -->
-        <burst-on-connect>1</burst-on-connect>
+        <!-- If enabled, this will provide a burst of data when a client 
+             first connects, thereby significantly reducing the startup 
+             time for listeners that do substantial buffering. However,
+             it also significantly increases latency, so it's disabled
+             by default -->
+        <burst-on-connect>0</burst-on-connect>
     </limits>
 
     <authentication>
diff --git a/src/cfgfile.c b/src/cfgfile.c
index 4b99cc2b..7ef1753b 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -339,7 +339,7 @@ static void _set_defaults(ice_config_t *configuration)
     configuration->num_yp_directories = 0;
     configuration->relay_username = NULL;
     configuration->relay_password = NULL;
-    configuration->burst_on_connect = 1;
+    configuration->burst_on_connect = 0;
 }
 
 static void _parse_root(xmlDocPtr doc, xmlNodePtr node,