diff --git a/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php b/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php
index 69d9aff8eb..b5d0c16ce9 100644
--- a/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php
@@ -43,7 +43,7 @@ class SubdefsEditor extends AbstractEditor
 <?xml version="1.0" encoding="UTF-8"?>
 <tasksettings>
   <embedded>1</embedded>
-  <sbas/>
+  <sbas>0</sbas>
   <type_image>1</type_image>
   <type_video>1</type_video>
   <type_audio>1</type_audio>
diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php
index 8b99c390b5..e3e040d77e 100644
--- a/lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php
@@ -70,12 +70,13 @@ class SubdefsJob extends AbstractJob
 
         $app->getApplicationBox()->get_connection();
 
+        $allDb = count($settings->xpath('sbas[text()="0"]')) > 0;
         foreach ($app->getDataboxes() as $databox) {
             if (!$this->isStarted()) {
                 break;
             }
 
-            if(count($settings->xpath("sbas[text()=".$databox->get_sbas_id() ."]")) == 0) {
+            if(!$allDb && count($settings->xpath("sbas[text()=".$databox->get_sbas_id() ."]")) == 0) {
                 continue;
             }
 
diff --git a/lib/Alchemy/Phrasea/TaskManager/Notifier.php b/lib/Alchemy/Phrasea/TaskManager/Notifier.php
index 101fb79753..d85b9f5f59 100644
--- a/lib/Alchemy/Phrasea/TaskManager/Notifier.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Notifier.php
@@ -25,7 +25,7 @@ class Notifier implements NotifierInterface
     private $logger;
 
     /** @var integer  */
-    private $timeout = 10;
+    private $timeout = 1;
 
     public function __construct(\ZMQSocket $socket, LoggerInterface $logger)
     {
diff --git a/templates/web/admin/task-manager/task-editor/subdefs.html.twig b/templates/web/admin/task-manager/task-editor/subdefs.html.twig
index b32fe6ba94..d72456bf7e 100644
--- a/templates/web/admin/task-manager/task-editor/subdefs.html.twig
+++ b/templates/web/admin/task-manager/task-editor/subdefs.html.twig
@@ -4,9 +4,12 @@
     <div class="control-group">
         <label class="control-label"> {{ 'Databox' | trans }}</label>
         <div class="controls">
+            <label class="checkbox inline">
+                <input class="subdef_task_sbas" type="checkbox" name="sbas[]" value="0"> {{ 'All' | trans }}
+            </label>
             {% for databox in app.getApplicationBox().get_databoxes() %}
             <label class="checkbox inline">
-                <input type="checkbox" name="sbas[]" value="{{ databox.get_sbas_id() }}"> {{ databox.get_viewname() }}
+                <input class="subdef_task_sbas" type="checkbox" name="sbas[]" value="{{ databox.get_sbas_id() }}"> {{ databox.get_viewname() }}
                 ({{ databox.get_sbas_id() }})
             </label>
             {% endfor %}
@@ -68,6 +71,10 @@
 {% block javascript %}
 <script type="text/javascript">
 
+    $(".subdef_task_sbas").change(function (e) {
+        checkSbas();
+    });
+
     function minmax(v, _min, _max)
     {
         if(isNaN(v) || v < _min)
@@ -80,6 +87,16 @@
         }
         return v;
     }
+    function checkSbas()
+    {
+        var alldb = $(".subdef_task_sbas[value=0]").prop('checked');
+        if(alldb) {
+            $(".subdef_task_sbas[value!=0]").prop('checked', true).attr('disabled', true);
+        }
+        else {
+            $(".subdef_task_sbas[value!=0]").attr('disabled', false);
+        }
+    }
     function taskFillGraphic(xml)
     {
         if (xml) {
@@ -98,12 +115,14 @@
             gform.flush.value = minmax(parseInt(xml.find("flush").text()), 1, 100);
             gform.maxrecs.value = minmax(parseInt(xml.find("maxrecs").text()), 10, 100);
             gform.maxmegs.value = minmax(parseInt(xml.find("maxmegs").text()), 64, 512);
+
             var $databoxes = $(gform).find("input[name='sbas[]']");
             for(i=0; i < $databoxes.length; i++) {
                 var sbid = $($databoxes[i]).attr('value');
 
                 $($databoxes[i]).prop('checked', (xml.find("sbas").filter(function(){return $(this).text()==sbid}).length > 0));
             }
+            checkSbas();
         }
     }
  </script>