diff --git a/server/fishtest/api.py b/server/fishtest/api.py
index 4c04d8907..9a14390fe 100644
--- a/server/fishtest/api.py
+++ b/server/fishtest/api.py
@@ -297,7 +297,6 @@ def stop_run(self):
                 self.request.rundb.stop_run(self.run_id())
             else:
                 self.request.rundb.set_inactive_task(self.task_id(), run)
-                self.request.rundb.buffer(run, True)
 
         self.handle_error(error, exception=HTTPUnauthorized)
         return self.add_time({})
diff --git a/server/fishtest/rundb.py b/server/fishtest/rundb.py
index 732d5e8ef..15dfe46a7 100644
--- a/server/fishtest/rundb.py
+++ b/server/fishtest/rundb.py
@@ -325,6 +325,7 @@ def set_inactive_task(self, task_id, run):
                             del self.connections_counter[remote_addr]
                     except Exception as e:
                         print(f"Error while deleting connection: {str(e)}", flush=True)
+        self.buffer(run, False, priority=1)
 
     def set_bad_task(self, task_id, run, residual=None, residual_color=None):
         zero_stats = {
@@ -365,6 +366,7 @@ def set_bad_task(self, task_id, run, residual=None, residual_color=None):
             # to zero.
             task["bad"] = True
             task["stats"] = copy.deepcopy(zero_stats)
+            self.buffer(run, False, priority=1)
 
     # Do not run two copies of this function in parallel!
     def update_aggregated_data(self):
@@ -738,6 +740,12 @@ def get_run(self, r_id):
             return self.runs.find_one({"_id": r_id_obj})
 
     def buffer(self, run, flush, priority=0, create=False):
+        """
+        Guidelines
+        ==========
+        priority=1 : finished task
+        priority=2 : new task
+        """
         if not self.is_primary_instance():
             print(
                 "Warning: attempt to use the run_cache on the",
@@ -859,7 +867,6 @@ def scavenge_dead_tasks(self):
                 task_id=task_id,
             )
             self.set_inactive_task(task_id, run)
-            self.buffer(run, False)
 
     def get_unfinished_runs_id(self):
         unfinished_runs = self.runs.find(
@@ -1279,7 +1286,7 @@ def priority(run):  # lower is better
 
         self.insert_in_wtt_map(run, task_id)
 
-        self.buffer(run, False, priority=1)
+        self.buffer(run, False, priority=2)
 
         # Cache some data. Currently we record the id's
         # the worker has seen, as well as the last id that was seen.
@@ -1532,7 +1539,6 @@ def failed_task(self, run_id, task_id, message="Unknown reason"):
         # Mark the task as inactive.
         self.set_inactive_task(task_id, run)
         self.handle_crash_or_time(run, task_id)
-        self.buffer(run, False)
         print(
             "Failed_task: failure for: https://tests.stockfishchess.org/tests/view/{}, "
             "task_id: {}, worker: {}, reason: '{}'".format(