diff --git a/desktop/flipper-frontend-core/src/client/FlipperServerClient.tsx b/desktop/flipper-frontend-core/src/client/FlipperServerClient.tsx
index 4b1d43f76..a64cfd519 100644
--- a/desktop/flipper-frontend-core/src/client/FlipperServerClient.tsx
+++ b/desktop/flipper-frontend-core/src/client/FlipperServerClient.tsx
@@ -25,6 +25,8 @@ export enum FlipperServerState {
 }
 
 export function createFlipperServer(
+  host: string,
+  port: number,
   onStateChange: (state: FlipperServerState) => void,
 ): Promise<FlipperServer> {
   onStateChange(FlipperServerState.CONNECTING);
@@ -38,7 +40,7 @@ export function createFlipperServer(
 
     const eventEmitter = new EventEmitter();
 
-    const socket = new ReconnectingWebSocket(`ws://${location.host}`);
+    const socket = new ReconnectingWebSocket(`ws://${host}:${port}`);
     const pendingRequests: Map<
       number,
       {
diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx
index 4001f8fff..5a06cc8b2 100644
--- a/desktop/flipper-ui-browser/src/index.tsx
+++ b/desktop/flipper-ui-browser/src/index.tsx
@@ -28,6 +28,8 @@ async function start() {
   setLoggerInstance(logger);
 
   const flipperServer = await createFlipperServer(
+    location.hostname,
+    parseInt(location.port, 10),
     (state: FlipperServerState) => {
       switch (state) {
         case FlipperServerState.CONNECTING: