diff --git a/locust/runners.py b/locust/runners.py
index 7d0a01efaf..cbe1d3a57c 100644
--- a/locust/runners.py
+++ b/locust/runners.py
@@ -891,7 +891,7 @@ def stop(self, send_stop_to_client: bool = True) -> None:
                     self.server.send_to_client(Message("stop", None, client.id))
 
                 # Give an additional 60s for all workers to stop
-                timeout = gevent.Timeout(self.environment.stop_timeout or 0 + 60)
+                timeout = gevent.Timeout(self.environment.stop_timeout + 60)
                 timeout.start()
                 try:
                     while self.user_count != 0: