diff --git a/doc/nrepl/bb.edn b/doc/nrepl/bb.edn
index ddc1105..8efe856 100644
--- a/doc/nrepl/bb.edn
+++ b/doc/nrepl/bb.edn
@@ -5,7 +5,8 @@
  :tasks {http-server {:doc "Starts http server for serving static files"
                       :requires ([babashka.http-server :as http])
                       :task (do (http/serve {:port 1341 :dir "."})
-                                (println "Serving static assets at http://localhost:1341"))}
+                                (println "Serving static assets at http://localhost:1341")
+                                (deref (promise)))}
 
          browser-nrepl {:doc "Start browser nREPL"
                         :requires ([sci.nrepl.browser-server :as bp])
diff --git a/src/scittle/nrepl.cljs b/src/scittle/nrepl.cljs
index e7fcad2..801a373 100644
--- a/src/scittle/nrepl.cljs
+++ b/src/scittle/nrepl.cljs
@@ -31,9 +31,12 @@
     :complete (let [completions (completions (assoc msg :ctx @!sci-ctx))]
                 (nrepl-reply msg completions))))
 
-(when (.-SCITTLE_NREPL_WEBSOCKET_PORT js/window)
+(defn ws-url [host port path]
+  (str "ws://" host ":" port "/" path))
+
+(let [ws-port (or (.-SCITTLE_NREPL_WEBSOCKET_PORT js/window) 1340)]
   (set! (.-ws_nrepl js/window)
-        (new js/WebSocket "ws://localhost:1340/_nrepl")))
+        (new js/WebSocket (ws-url "localhost" ws-port "_nrepl"))))
 
 (when-let [ws (nrepl-websocket)]
   (prn :ws ws)