diff --git a/bigchaindb/__init__.py b/bigchaindb/__init__.py
index 8a9554ca57..7f4e74eb78 100644
--- a/bigchaindb/__init__.py
+++ b/bigchaindb/__init__.py
@@ -89,8 +89,7 @@
         'bind': 'localhost:9984',
         'loglevel': logging.getLevelName(
             log_config['handlers']['console']['level']).lower(),
-        'threads': 1,
-        'workers': 1,  # if None, the value will be cpu_count * 2 + 1
+        'workers': None,  # if None, the value will be cpu_count * 2 + 1
     },
     'wsserver': {
         'scheme': 'ws',
diff --git a/docs/server/source/server-reference/configuration.md b/docs/server/source/server-reference/configuration.md
index c55ba83e8d..ba0cca8e98 100644
--- a/docs/server/source/server-reference/configuration.md
+++ b/docs/server/source/server-reference/configuration.md
@@ -126,7 +126,7 @@ export BIGCHAINDB_SERVER_WORKERS=5
 "server": {
     "bind": "localhost:9984",
     "loglevel": "info",
-    "workers": 1,
+    "workers": null,
 }
 ```