diff --git a/lib/api-functions.coffee b/lib/api-functions.coffee
index ba34e1e..5b3d834 100644
--- a/lib/api-functions.coffee
+++ b/lib/api-functions.coffee
@@ -84,7 +84,7 @@ connectionRequest = (deviceId, callback) ->
     )
 
     request.on('socket', (socket) ->
-      socket.setTimeout(2000)
+      socket.setTimeout(config.get('CONNECTION_REQUEST_TIMEOUT', deviceId))
       socket.on('timeout', () ->
         request.abort()
       )
diff --git a/lib/config.coffee b/lib/config.coffee
index d45a39a..bddb9c4 100644
--- a/lib/config.coffee
+++ b/lib/config.coffee
@@ -50,6 +50,7 @@ options = {
   GET_PARAMETER_NAMES_DEPTH_THRESHOLD : {type : 'int', default : 0},
   TASK_PARAMETERS_BATCH_SIZE : {type : 'int', default : 32},
   COOKIES_PATH : {type : 'string'},
+  CONNECTION_REQUEST_TIMEOUT : {type : 'int', default : 2000},
 
   # Libxml related configuration
   XML_PARSE_RECOVER : {type : 'bool'},