diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCache.java b/server/src/main/java/io/druid/client/cache/MemcachedCache.java
index abbfb54139c..15d88e36347 100644
--- a/server/src/main/java/io/druid/client/cache/MemcachedCache.java
+++ b/server/src/main/java/io/druid/client/cache/MemcachedCache.java
@@ -32,6 +32,8 @@ import net.spy.memcached.FailureMode;
 import net.spy.memcached.MemcachedClient;
 import net.spy.memcached.MemcachedClientIF;
 import net.spy.memcached.internal.BulkFuture;
+import net.spy.memcached.ops.LinkedOperationQueueFactory;
+import net.spy.memcached.ops.OperationQueueFactory;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import javax.annotation.Nullable;
@@ -56,7 +58,15 @@ public class MemcachedCache implements Cache
 
       // always use compression
       transcoder.setCompressionThreshold(0);
-      MemcachedOperationQueueFactory queueFactory = new MemcachedOperationQueueFactory(config.getMaxOperationQueueSize());
+
+      OperationQueueFactory opQueueFactory;
+      long maxQueueBytes = config.getMaxOperationQueueSize();
+      if(maxQueueBytes > 0) {
+        opQueueFactory = new MemcachedOperationQueueFactory(maxQueueBytes);
+      } else {
+        opQueueFactory = new LinkedOperationQueueFactory();
+      }
+
       return new MemcachedCache(
         new MemcachedClient(
           new ConnectionFactoryBuilder().setProtocol(ConnectionFactoryBuilder.Protocol.BINARY)
@@ -68,7 +78,7 @@ public class MemcachedCache implements Cache
                                         .setShouldOptimize(true)
                                         .setOpQueueMaxBlockTime(config.getTimeout())
                                         .setOpTimeout(config.getTimeout())
-                                        .setOpQueueFactory(queueFactory)
+                                        .setOpQueueFactory(opQueueFactory)
                                         .build(),
           AddrUtil.getAddresses(config.getHosts())
         ),
diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java b/server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java
index 2d8674cdd24..fa40fd7d6c3 100644
--- a/server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java
+++ b/server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java
@@ -36,8 +36,10 @@ public class MemcachedCacheConfig
   private int maxObjectSize = 50 * 1024 * 1024;
   @JsonProperty
   private String memcachedPrefix = "druid";
+
+  // maximum size in bytes of memcached client operation queue. 0 means unlimited
   @JsonProperty
-  private long maxOperationQueueSize = 256 * 1024 * 1024L; // 256 MB
+  private long maxOperationQueueSize = 0;
 
   public int getExpiration()
   {