diff --git a/tools/aws_benchmarking/server/cluster_master.py b/tools/aws_benchmarking/server/cluster_master.py
index 7952e61159ec31a4be5394b50f30cbc20f9b414e..1333a942bf013a8182585b56e5843803c56945b1 100644
--- a/tools/aws_benchmarking/server/cluster_master.py
+++ b/tools/aws_benchmarking/server/cluster_master.py
@@ -640,6 +640,7 @@ def start_server(args):
             elif request_path == "/cleanup":
                 self._set_headers()
                 logging.info("Received request to cleanup cluster")
+                args.no_clean_up = False
                 cleanup(args.task_name)
                 self.wfile.write("cleanup in progress")