diff --git a/syndicate/distributed/tcp-server.rkt b/syndicate/distributed/tcp-server.rkt
index 41af355..78d6b0c 100644
--- a/syndicate/distributed/tcp-server.rkt
+++ b/syndicate/distributed/tcp-server.rkt
@@ -26,8 +26,10 @@
 
     (spawn-tcp-driver ds)
     (spawn #:name 'tcp-server
+           (define spec (TcpLocal "0.0.0.0" 5999))
            (at ds
-             (during/spawn (StreamConnection $source $sink (TcpLocal "0.0.0.0" 5999))
+             (stop-on (asserted (TcpListenError spec _)))
+             (during/spawn (StreamConnection $source $sink spec)
                #:name (list 'tcp-server source)
                (run-relay #:packet-writer (lambda (bs) (send-data sink bs))
                           #:setup-inputs