diff --git a/templates/web/admin/task-manager/index.html.twig b/templates/web/admin/task-manager/index.html.twig
index 8793462bed..92767eacf6 100644
--- a/templates/web/admin/task-manager/index.html.twig
+++ b/templates/web/admin/task-manager/index.html.twig
@@ -10,7 +10,6 @@
         </h1>
     </div>
 
-
     <table class="admintable">
         <thead>
             <tr>
diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig
index 9559e0fb7d..d3084986d5 100644
--- a/templates/web/admin/tree.html.twig
+++ b/templates/web/admin/tree.html.twig
@@ -62,7 +62,7 @@
 
   {% if app['acl'].get(app['authentication'].getUser()).has_right('taskmanager') %}
   <li class="{% if feature == 'taskmanager' %}selected{% endif %}">
-    <a target="right" href="{{ path('admin_tasks_list') }}" class="ajax">
+    <a target="right" href="{{ path('admin_tasks_list') }}" class="ajax" data-ws-topic="http://phraseanet.com/topics/admin/task-manager">
       <img src="/skins/admin/TaskManager.png" />
       <span>{{ 'admin::utilisateurs: gestionnaire de taches' | trans }}</span>
     </a>
diff --git a/www/scripts/apps/admin/tasks-manager/app.js b/www/scripts/apps/admin/tasks-manager/app.js
index 051f04972b..39c1aa9ef8 100644
--- a/www/scripts/apps/admin/tasks-manager/app.js
+++ b/www/scripts/apps/admin/tasks-manager/app.js
@@ -13,21 +13,20 @@ define([
     "backbone",
     "models/scheduler",
     "common/websockets/connection",
+    "common/websockets/subscriberManager",
     "apps/admin/tasks-manager/views/scheduler",
     "apps/admin/tasks-manager/views/tasks",
     "apps/admin/tasks-manager/views/ping",
     "apps/admin/tasks-manager/views/refresh",
     "apps/admin/tasks-manager/collections/tasks"
-], function ($, _, Backbone, Scheduler, WSConnection, SchedulerView, TasksView, PingView, RefreshView, TasksCollection) {
+], function ($, _, Backbone, Scheduler, WSConnection, SubscriberManager, SchedulerView, TasksView, PingView, RefreshView, TasksCollection) {
     var create = function() {
         window.TaskManagerApp = {
             $scope: $("#task-manager-app"),
             $tasksListView : $(".tasks-list-view", this.$scope),
             $schedulerView : $(".scheduler-view", this.$scope),
             $pingView : $(".ping-view", this.$scope),
-            $refreshView : $(".refresh-view", this.$scope),
-            eventAggregator: _.extend({}, Backbone.Events),
-            wstopic: "http://phraseanet.com/topics/admin/task-manager"
+            $refreshView : $(".refresh-view", this.$scope)
         };
 
         TaskManagerApp.tasksCollection = new TasksCollection();
@@ -56,7 +55,7 @@ define([
                 TaskManagerApp.tasksView.render();
                 TaskManagerApp.schedulerView.render();
 
-                WSConnection.subscribe(TaskManagerApp.wstopic, function(topic, msg) {
+                SubscriberManager.pushCallback(function(topic, msg) {
                     // double encoded string
                     var msg = JSON.parse(JSON.parse(msg));
                     WSConnection.trigger("ws:"+msg.event, msg);
diff --git a/www/scripts/apps/admin/tasks-manager/main.js b/www/scripts/apps/admin/tasks-manager/main.js
index fa185294fb..adb41d81db 100644
--- a/www/scripts/apps/admin/tasks-manager/main.js
+++ b/www/scripts/apps/admin/tasks-manager/main.js
@@ -7,16 +7,6 @@
  * file that was distributed with this source code.
  */
 
-// configure AMD loading
-require.config({
-    baseUrl: "/scripts",
-    paths: {
-        jquery: "../assets/jquery/jquery",
-        underscore: "../assets/underscore-amd/underscore",
-        backbone: "../assets/backbone-amd/backbone"
-    }
-});
-
 // launch application
 require(["apps/admin/tasks-manager/app"], function (App) {
     App.initialize();
diff --git a/www/scripts/apps/admin/tasks-manager/views/tasks.js b/www/scripts/apps/admin/tasks-manager/views/tasks.js
index 8716671751..2332add3ec 100644
--- a/www/scripts/apps/admin/tasks-manager/views/tasks.js
+++ b/www/scripts/apps/admin/tasks-manager/views/tasks.js
@@ -9,12 +9,10 @@
 
 define([
     "jquery",
-    "jqueryui",
     "underscore",
     "backbone",
-    "i18n",
     "apps/admin/tasks-manager/views/task"
-], function ($, jqueryui, _, Backbone, i18n, TaskView) {
+], function ($, _, Backbone, TaskView) {
     var TasksView = Backbone.View.extend({
         initialize: function() {
             this._taskViews = [];