diff --git a/collects/handin-server/web-status-server.ss b/collects/handin-server/web-status-server.ss
index 64307edc6e..d6c371ab5c 100644
--- a/collects/handin-server/web-status-server.ss
+++ b/collects/handin-server/web-status-server.ss
@@ -272,8 +272,9 @@
 
 (provide run)
 (define (run p)
-  (thread (lambda () (dynamic-wind
-                       (lambda () (log-line "*** starting web server"))
-                       (run-servlet p)
-                       (lambda () (log-line "*** web server died!")))))
-  (void))
+  (define t
+    (thread (lambda () (dynamic-wind
+                         (lambda () (log-line "*** starting web server"))
+                         (run-servlet p)
+                         (lambda () (log-line "*** web server died!"))))))
+  (lambda () (thread-break t)))