diff --git a/locust/web.py b/locust/web.py
index 79fe9ac6bf..3e748b92b6 100644
--- a/locust/web.py
+++ b/locust/web.py
@@ -174,8 +174,6 @@ def stop():
                 self._swarm_greenlet.kill(block=True)
                 self._swarm_greenlet = None
             environment.runner.stop()
-            if self.greenlet is not None:
-                self.greenlet.kill(block=True)
             return jsonify({"success": True, "message": "Test stopped"})
 
         @app.route("/stats/reset")