diff --git a/python/ycm/client/base_request.py b/python/ycm/client/base_request.py
index 8781c5d3..48da08b9 100644
--- a/python/ycm/client/base_request.py
+++ b/python/ycm/client/base_request.py
@@ -28,7 +28,7 @@ from ycm import vimsupport
 from ycm.server.responses import ServerError, UnknownExtraConf
 
 HEADERS = {'content-type': 'application/json'}
-EXECUTOR = ThreadPoolExecutor( max_workers = 4 )
+EXECUTOR = ThreadPoolExecutor( max_workers = 10 )
 
 class BaseRequest( object ):
   def __init__( self ):
diff --git a/python/ycm/server/ycmd.py b/python/ycm/server/ycmd.py
index 0619c193..ec20875c 100755
--- a/python/ycm/server/ycmd.py
+++ b/python/ycm/server/ycmd.py
@@ -38,7 +38,8 @@ import json
 import bottle
 import argparse
 import httplib
-from bottle import run, request, response
+import waitress
+from bottle import request, response
 import server_state
 from ycm import user_options_store
 from ycm.server.responses import BuildExceptionResponse
@@ -247,7 +248,7 @@ def Main():
                        level = numeric_level )
 
   LOGGER = logging.getLogger( __name__ )
-  run( app = app, host = args.host, port = args.port, server='waitress' )
+  waitress.serve( app, host = args.host, port = args.port, threads = 10 )
 
 
 if __name__ == "__main__":