diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 54f7946a9a3..52124d5f896 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -511,7 +511,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                         self.dataset.index = 0;
                     }
                 } else if (self.dataset.index >= self.records.length) {
-                    self.dataset.index = 0;
+                    self.dataset.index = self.records.length ? 0 : null;
                 }
 
                 self.compute_aggregates();
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 91bbf9ceeed..63bfc769e14 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -290,6 +290,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
                 if (!_.isEmpty(self.dataset.ids) && (self.dataset.index === null || self.dataset.index >= self.dataset.ids.length)) {
                     self.dataset.index = 0;
+                } else if (_.isEmpty(self.dataset.ids)){
+                    self.dataset.index = null;
                 }
                 self.do_add_groups([kgroup]).done(function() {
                     if (_.isEmpty(records)) {