diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs
index b5e4e71d..de3e195c 100644
--- a/src/cmd/serve.rs
+++ b/src/cmd/serve.rs
@@ -326,10 +326,17 @@ pub fn serve(
             }
         })
         .unwrap();
+
         let broadcaster = ws_server.broadcaster();
+
+        let ws_server = ws_server
+            .bind(&*ws_address)
+            .map_err(|_| format!("Address {} is already in use.", &ws_address))?;
+
         thread::spawn(move || {
-            ws_server.listen(&*ws_address).unwrap();
+            ws_server.run().unwrap();
         });
+
         Some(broadcaster)
     } else {
         println!("Watching in watch only mode, no web server will be started");