diff --git a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/maintasks/obawo-tasks-view.js b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/maintasks/obawo-tasks-view.js
index 737e663e..90664465 100644
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/maintasks/obawo-tasks-view.js
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/maintasks/obawo-tasks-view.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2016-2021 Openbravo S.L.U.
+ * Copyright (C) 2016-2022 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -199,21 +199,24 @@ enyo.kind({
       var serverTaskCollection = newData.updatedTaskListCollection;
       //Compare current list with coming list
       if (me.model.get('taskList')) {
-        _.each(serverTaskCollection.models, function(model) {
-          var idx = model.collection.models.indexOf(model);
-          _.each(me.model.get('taskList').models, function(localModel) {
-            if (
+        _.each(serverTaskCollection.models, function(model, idx) {
+          if (!model || !model.collection) {
+            return;
+          }
+          const newModel = me.model.get('taskList').models.find(localModel => {
+            return (
               localModel.id === model.id &&
               localModel &&
               (localModel.get('_updated') === true ||
                 (localModel.get('_status') &&
                   localModel.get('_status') !== 'pending'))
-            ) {
-              localModel.set('priority', model.get('priority'));
-              serverTaskCollection.remove(serverTaskCollection.at(idx));
-              serverTaskCollection.add(localModel, { at: idx, silent: true });
-            }
+            );
           });
+          if (newModel) {
+            newModel.set('priority', model.get('priority'));
+            serverTaskCollection.remove(model);
+            serverTaskCollection.add(newModel, { at: idx, silent: true });
+          }
         });
         me.model.get('taskList').reset(serverTaskCollection.models);
       }