diff --git a/web/app/src/components/JobsTable.vue b/web/app/src/components/JobsTable.vue
index 918f66de..e52b48c4 100644
--- a/web/app/src/components/JobsTable.vue
+++ b/web/app/src/components/JobsTable.vue
@@ -66,7 +66,7 @@ export default {
     this.tabulator = new Tabulator('#flamenco_job_list', this.options);
     this.tabulator.on("rowSelected", this.onRowSelected);
     this.tabulator.on("rowDeselected", this.onRowDeselected);
-    this.fetchAllJobs();
+    this.tabulator.on("tableBuilt", this.fetchAllJobs);
   },
   methods: {
     onReconnected() {
diff --git a/web/app/src/components/TasksTable.vue b/web/app/src/components/TasksTable.vue
index dc1695e2..3b6f10fa 100644
--- a/web/app/src/components/TasksTable.vue
+++ b/web/app/src/components/TasksTable.vue
@@ -67,7 +67,7 @@ export default {
     this.tabulator = new Tabulator('#flamenco_task_list', this.options);
     this.tabulator.on("rowSelected", this.onRowSelected);
     this.tabulator.on("rowDeselected", this.onRowDeselected);
-    this.fetchTasks();
+    this.tabulator.on("tableBuilt", this.fetchTasks);
   },
   watch: {
     jobID() {