diff --git a/templates/default/redis.conf.erb b/templates/default/redis.conf.erb
index 5744e65..d94d2f1 100644
--- a/templates/default/redis.conf.erb
+++ b/templates/default/redis.conf.erb
@@ -170,10 +170,12 @@ appendfsync always
 
 ############################### ADVANCED CONFIG ###############################
 
-# Glue small output buffers together in order to send small replies in a
+<% if node['redis']['source']['version'].to_f < 2.6; then %>
+<%= "# Glue small output buffers together in order to send small replies in a
 # single TCP packet. Uses a bit more CPU but most of the times it is a win
 # in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+glueoutputbuf yes" %>
+<% end %>
 
 # Use object sharing. Can save a lot of memory if you have many common
 # string in your dataset, but performs lookups against the shared objects