diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 69fd3f792..0ed1eb5f5 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1682,6 +1682,9 @@ namespace aux {
 
 		m_settings = s;
 
+		if (m_settings.cache_buffer_chunk_size <= 0)
+			m_settings.cache_buffer_chunk_size = 1;
+
 		update_rate_settings();
 
 		if (connections_limit_changed) update_connections_limit();