diff --git a/lib/nbi.js b/lib/nbi.js
index f4fad47..283c3f8 100644
--- a/lib/nbi.js
+++ b/lib/nbi.js
@@ -319,14 +319,15 @@ function listener(request, response) {
                     return;
                   }
 
-                  const DEVICE_ONLINE_THRESHOLD = config.get(
-                    "DEVICE_ONLINE_THRESHOLD",
-                    deviceId
-                  );
+                  const taskTimeout =
+                    (urlParts.query.timeout &&
+                      parseInt(urlParts.query.timeout)) ||
+                    config.get("DEVICE_ONLINE_THRESHOLD", deviceId);
+
                   apiFunctions.watchTask(
                     deviceId,
                     task._id,
-                    DEVICE_ONLINE_THRESHOLD,
+                    taskTimeout,
                     (err, status) => {
                       if (err) return void throwError(err, response);