diff --git a/README.md b/README.md
index 7b58c908..891e57fd 100644
--- a/README.md
+++ b/README.md
@@ -131,13 +131,17 @@ You can customize project before build by overriding the
 * `INCLUDE_GOOG` - include code for Android device tracking and control
 * `INCLUDE_ADB_SHELL` - [remote shell](#remote-shell) for android devices
 ([xtermjs/xterm.js][xterm.js], [Tyriar/node-pty][node-pty])
-* `INCLUDE_DEV_TOOLS` - [dev tools](#debug-webpageswebview) for web pages and web views on android
-devices
+* `INCLUDE_DEV_TOOLS` - [dev tools](#debug-webpageswebview) for web pages and
+web views on android devices
 * `INCLUDE_FILE_LISTING` - minimalistic [file management](#file-listing)
 * `USE_BROADWAY` - include [Broadway Player](#broadway-player)
 * `USE_H264_CONVERTER` - include [Mse Player](#mse-player)
 * `USE_TINY_H264` - include [TinyH264 Player](#tinyh264-player)
 * `USE_WEBCODECS` - include [WebCodecs Player](#webcodecs-player)
+* `SCRCPY_LISTENS_ON_ALL_INTERFACES` - WebSocket server in `scrcpy-server.jar`
+will listen for connections on all available interfaces. When `true`, it allows
+connecting to device directly from a browser. Otherwise, the connection must be
+established over adb.
 
 ## Run configuration
 
diff --git a/src/app/googDevice/client/DeviceTracker.ts b/src/app/googDevice/client/DeviceTracker.ts
index 232ecd21..7f15bbf8 100644
--- a/src/app/googDevice/client/DeviceTracker.ts
+++ b/src/app/googDevice/client/DeviceTracker.ts
@@ -80,15 +80,16 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
 
     onInterfaceSelected = (e: Event): void => {
         const selectElement = e.currentTarget as HTMLSelectElement;
-        this.updateLink(selectElement, true);
-    };
-
-    private updateLink(selectElement: HTMLSelectElement, store: boolean): void {
         const option = selectElement.selectedOptions[0];
         const url = decodeURI(option.getAttribute(Attribute.URL) || '');
-        const name = option.getAttribute(Attribute.NAME);
+        const name = option.getAttribute(Attribute.NAME) || '';
         const fullName = decodeURIComponent(selectElement.getAttribute(Attribute.FULL_NAME) || '');
-        const udid = selectElement.getAttribute(Attribute.UDID);
+        const udid = selectElement.getAttribute(Attribute.UDID) || '';
+        this.updateLink({ url, name, fullName, udid, store: true });
+    };
+
+    private updateLink(params: { url: string; name: string; fullName: string; udid: string; store: boolean }): void {
+        const { url, name, fullName, udid, store } = params;
         const playerTds = document.getElementsByName(
             encodeURIComponent(`${DeviceTracker.AttributePrefixPlayerFor}${fullName}`),
         );
@@ -147,8 +148,7 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
         return `device_list::${udid}::interface`;
     }
 
-    private static createInterfaceOption(params: ParamsDeviceTracker, name: string, udid = ''): HTMLOptionElement {
-        const optionElement = document.createElement('option');
+    protected static createUrl(params: ParamsDeviceTracker, udid = ''): URL {
         const secure = !!params.secure;
         const hostname = params.hostname || location.hostname;
         const port = typeof params.port === 'number' ? params.port : secure ? 443 : 80;
@@ -158,7 +158,11 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
             urlObject.searchParams.set('remote', `tcp:${SERVER_PORT.toString(10)}`);
             urlObject.searchParams.set('udid', udid);
         }
-        const url = urlObject.toString();
+        return urlObject;
+    }
+
+    protected static createInterfaceOption(name: string, url: string): HTMLOptionElement {
+        const optionElement = document.createElement('option');
         optionElement.setAttribute(Attribute.URL, url);
         optionElement.setAttribute(Attribute.NAME, name);
         optionElement.innerText = `proxy over adb`;
@@ -170,13 +174,12 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
     }
 
     protected buildDeviceRow(tbody: Element, device: GoogDeviceDescriptor): void {
+        let selectedInterfaceUrl = '';
+        let selectedInterfaceName = '';
         const blockClass = 'desc-block';
         const fullName = `${this.id}_${Util.escapeUdid(device.udid)}`;
         const isActive = device.state === DeviceState.DEVICE;
-        const localStorageKey = DeviceTracker.getLocalStorageKey(fullName);
-        const lastSelected = localStorage && localStorage.getItem(localStorageKey);
         let hasPid = false;
-        let selectInterface: HTMLSelectElement | undefined;
         const servicesId = `device_services_${fullName}`;
         const row = html`<div class="device ${isActive ? 'active' : 'not-active'}">
             <div class="device-header">
@@ -252,6 +255,10 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
                 actionButton.appendChild(span);
                 td.appendChild(actionButton);
             } else if (fieldName === 'interfaces') {
+                const proxyInterfaceUrl = DeviceTracker.createUrl(this.params, device.udid).toString();
+                const proxyInterfaceName = 'proxy';
+                const localStorageKey = DeviceTracker.getLocalStorageKey(fullName);
+                const lastSelected = localStorage && localStorage.getItem(localStorageKey);
                 const selectElement = document.createElement('select');
                 selectElement.setAttribute(Attribute.UDID, device.udid);
                 selectElement.setAttribute(Attribute.FULL_NAME, fullName);
@@ -259,30 +266,39 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
                     'name',
                     encodeURIComponent(`${DeviceTracker.AttributePrefixInterfaceSelectFor}${fullName}`),
                 );
-                device[fieldName].forEach((value) => {
-                    const optionElement = DeviceTracker.createInterfaceOption(
-                        {
-                            ...this.params,
-                            secure: false,
-                            hostname: value.ipv4,
-                            port: SERVER_PORT,
-                        },
-                        value.name,
-                    );
+                /// #if SCRCPY_LISTENS_ON_ALL_INTERFACES
+                device.interfaces.forEach((value) => {
+                    const params = {
+                        ...this.params,
+                        secure: false,
+                        hostname: value.ipv4,
+                        port: SERVER_PORT,
+                    };
+                    const url = DeviceTracker.createUrl(params).toString();
+                    const optionElement = DeviceTracker.createInterfaceOption(value.name, url);
                     optionElement.innerText = `${value.name}: ${value.ipv4}`;
                     selectElement.appendChild(optionElement);
                     if (lastSelected) {
-                        if (lastSelected === value.name) {
+                        if (lastSelected === value.name || !selectedInterfaceName) {
                             optionElement.selected = true;
+                            selectedInterfaceUrl = url;
+                            selectedInterfaceName = value.name;
                         }
                     } else if (device['wifi.interface'] === value.name) {
                         optionElement.selected = true;
                     }
                 });
+                /// #else
+                selectedInterfaceUrl = proxyInterfaceUrl;
+                selectedInterfaceName = proxyInterfaceName;
+                td.classList.add('hidden');
+                /// #endif
                 if (isActive) {
-                    const adbProxyOption = DeviceTracker.createInterfaceOption(this.params, 'proxy', device.udid);
-                    if (lastSelected === 'proxy') {
+                    const adbProxyOption = DeviceTracker.createInterfaceOption(proxyInterfaceName, proxyInterfaceUrl);
+                    if (lastSelected === proxyInterfaceName || !selectedInterfaceName) {
                         adbProxyOption.selected = true;
+                        selectedInterfaceUrl = proxyInterfaceUrl;
+                        selectedInterfaceName = proxyInterfaceName;
                     }
                     selectElement.appendChild(adbProxyOption);
                     const actionButton = document.createElement('button');
@@ -296,7 +312,6 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
                 }
                 selectElement.onchange = this.onInterfaceSelected;
                 td.appendChild(selectElement);
-                selectInterface = selectElement;
             } else {
                 td.innerText = value;
             }
@@ -316,8 +331,14 @@ export class DeviceTracker extends BaseDeviceTracker<GoogDeviceDescriptor, never
         }
 
         tbody.appendChild(row);
-        if (DeviceTracker.CREATE_DIRECT_LINKS && hasPid && selectInterface) {
-            this.updateLink(selectInterface, false);
+        if (DeviceTracker.CREATE_DIRECT_LINKS && hasPid && selectedInterfaceUrl) {
+            this.updateLink({
+                url: selectedInterfaceUrl,
+                name: selectedInterfaceName,
+                fullName,
+                udid: device.udid,
+                store: false,
+            });
         }
     }
 
diff --git a/src/common/Constants.ts b/src/common/Constants.ts
index d0fd5189..5eb904e1 100644
--- a/src/common/Constants.ts
+++ b/src/common/Constants.ts
@@ -1,12 +1,19 @@
 export const SERVER_PACKAGE = 'com.genymobile.scrcpy.Server';
 export const SERVER_PORT = 8886;
-export const SERVER_VERSION = '1.17-ws5';
+export const SERVER_VERSION = '1.17-ws6';
 
 export const SERVER_TYPE = 'web';
 
 export const LOG_LEVEL = 'ERROR';
 
-const ARGUMENTS = [SERVER_VERSION, SERVER_TYPE, LOG_LEVEL, SERVER_PORT];
+let SCRCPY_LISTENS_ON_ALL_INTERFACES;
+/// #if SCRCPY_LISTENS_ON_ALL_INTERFACES
+SCRCPY_LISTENS_ON_ALL_INTERFACES = true;
+/// #else
+SCRCPY_LISTENS_ON_ALL_INTERFACES = false;
+/// #endif
+
+const ARGUMENTS = [SERVER_VERSION, SERVER_TYPE, LOG_LEVEL, SERVER_PORT, SCRCPY_LISTENS_ON_ALL_INTERFACES];
 
 export const SERVER_PROCESS_NAME = 'app_process';
 
diff --git a/src/style/devicelist.css b/src/style/devicelist.css
index 4de863f2..64e4c591 100644
--- a/src/style/devicelist.css
+++ b/src/style/devicelist.css
@@ -147,6 +147,10 @@ body.list #device_list_menu {
     display: inline-flex;
 }
 
+#devices .device-list div.desc-block.hidden {
+    display: none;
+}
+
 #devices .device-list div.desc-block.stream,
 #devices .device-list div.desc-block.server_pid,
 #devices .device-list div.desc-block.net_interface {
diff --git a/vendor/Genymobile/scrcpy/scrcpy-server.jar b/vendor/Genymobile/scrcpy/scrcpy-server.jar
index 8f7b9576..445503cd 100644
Binary files a/vendor/Genymobile/scrcpy/scrcpy-server.jar and b/vendor/Genymobile/scrcpy/scrcpy-server.jar differ
diff --git a/webpack/default.build.config.json b/webpack/default.build.config.json
index 407fa45d..9b531a2e 100644
--- a/webpack/default.build.config.json
+++ b/webpack/default.build.config.json
@@ -1,4 +1,5 @@
 {
+  "SCRCPY_LISTENS_ON_ALL_INTERFACES": true,
   "USE_WEBCODECS": true,
   "USE_BROADWAY": true,
   "USE_H264_CONVERTER": true,