diff --git a/lib/GeneralServer/GeneralServer.h b/lib/GeneralServer/GeneralServer.h
index 22ee8428b2..e65679cb76 100644
--- a/lib/GeneralServer/GeneralServer.h
+++ b/lib/GeneralServer/GeneralServer.h
@@ -114,8 +114,8 @@ namespace triagens {
             _ports(),
             _listenTasks(),
             _commTasks(),
-            _handlers(128),
-            _task2handler(128) {
+            _handlers(512),
+            _task2handler(512) {
           GENERAL_SERVER_INIT(&_commTasksLock);
           GENERAL_SERVER_INIT(&_mappingLock);
         }
diff --git a/lib/GeneralServer/GeneralServerDispatcher.h b/lib/GeneralServer/GeneralServerDispatcher.h
index bd0a26e046..992752a081 100644
--- a/lib/GeneralServer/GeneralServerDispatcher.h
+++ b/lib/GeneralServer/GeneralServerDispatcher.h
@@ -91,7 +91,7 @@ namespace triagens {
         GeneralServerDispatcher (Scheduler* scheduler)
           : GeneralServer<S, HF, CT>(scheduler),
             _dispatcher(0),
-            _job2handler(128) {
+            _job2handler(512) {
         }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -101,7 +101,7 @@ namespace triagens {
         GeneralServerDispatcher (Scheduler* scheduler, Dispatcher* dispatcher)
           : GeneralServer<S, HF, CT>(scheduler),
             _dispatcher(dispatcher),
-            _job2handler(128) {
+            _job2handler(512) {
         }
 
 ////////////////////////////////////////////////////////////////////////////////