diff --git a/config.toml.sample b/config.toml.sample
index 1653ff02a4..faf8622634 100644
--- a/config.toml.sample
+++ b/config.toml.sample
@@ -38,7 +38,7 @@ dir = "/tmp/influxdb/development/db"
 # How many requests to potentially buffer in memory. If the buffer gets filled then writes
 # will still be logged and once the local storage has caught up (or compacted) the writes
 # will be replayed from the WAL
-write-buffer-size = 1000
+write-buffer-size = 10000
 
 [cluster]
 # A comma separated list of servers to seed
@@ -62,11 +62,11 @@ protobuf_heartbeat = "200ms" # the heartbeat interval between the servers. must
 # How many write requests to potentially buffer in memory per server. If the buffer gets filled then writes
 # will still be logged and once the server has caught up (or come back online) the writes
 # will be replayed from the WAL
-write-buffer-size = 1000
+write-buffer-size = 10000
 
 # When queries get distributed out, the go in parallel. However, the responses must be sent in time order.
 # This setting determines how many responses can be buffered in memory per shard before data starts gettind dropped.
-query-shard-buffer-size = 500
+query-shard-buffer-size = 1000
 
 [leveldb]
 
diff --git a/src/configuration/config.toml b/src/configuration/config.toml
index daf444ebd3..b60c6d29d2 100644
--- a/src/configuration/config.toml
+++ b/src/configuration/config.toml
@@ -35,7 +35,7 @@ dir = "/tmp/influxdb/development/db"
 # How many requests to potentially buffer in memory. If the buffer gets filled then writes
 # will still be logged and once the local storage has caught up (or compacted) the writes
 # will be replayed from the WAL
-write-buffer-size = 1000
+write-buffer-size = 10000
 
 [cluster]
 # A comma separated list of servers to seed
@@ -59,11 +59,11 @@ protobuf_heartbeat = "200ms" # the heartbeat interval between the servers. must
 # How many write requests to potentially buffer in memory per server. If the buffer gets filled then writes
 # will still be logged and once the server has caught up (or come back online) the writes
 # will be replayed from the WAL
-write-buffer-size = 1000
+write-buffer-size = 10000
 
 # When queries get distributed out, the go in parallel. However, the responses must be sent in time order.
 # This setting determines how many responses can be buffered in memory per shard before data starts gettind dropped.
-query-shard-buffer-size = 500
+query-shard-buffer-size = 1000
 
 [leveldb]