diff --git a/libraries/adb-scrcpy/src/connection.ts b/libraries/adb-scrcpy/src/connection.ts
index 3bf20527..731e152d 100644
--- a/libraries/adb-scrcpy/src/connection.ts
+++ b/libraries/adb-scrcpy/src/connection.ts
@@ -16,7 +16,7 @@ import {
 } from "@yume-chan/stream-extra";
 
 export interface AdbScrcpyConnectionOptions {
-    scid: number;
+    scid: string | undefined;
 
     video: boolean;
 
@@ -60,8 +60,8 @@ export abstract class AdbScrcpyConnection implements Disposable {
 
     protected getSocketName(): string {
         let socketName = "localabstract:" + SCRCPY_SOCKET_NAME_PREFIX;
-        if (this.options.scid !== undefined && this.options.scid >= 0) {
-            socketName += "_" + this.options.scid.toString(16).padStart(8, "0");
+        if (this.options.scid !== undefined) {
+            socketName += "_" + this.options.scid.padStart(8, "0");
         }
         return socketName;
     }
diff --git a/libraries/adb-scrcpy/src/options/1_16.ts b/libraries/adb-scrcpy/src/options/1_16.ts
index e8e55aad..47fa8275 100644
--- a/libraries/adb-scrcpy/src/options/1_16.ts
+++ b/libraries/adb-scrcpy/src/options/1_16.ts
@@ -119,7 +119,7 @@ export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<
         return AdbScrcpyOptions1_16.createConnection(
             adb,
             {
-                scid: -1, // Not Supported
+                scid: undefined, // Not Supported
                 video: true, // Always enabled
                 audio: false, // Not Supported
                 control: true, // Always enabled even when `--no-control` is specified
diff --git a/libraries/adb-scrcpy/src/options/1_22.ts b/libraries/adb-scrcpy/src/options/1_22.ts
index bdefc293..a1d35853 100644
--- a/libraries/adb-scrcpy/src/options/1_22.ts
+++ b/libraries/adb-scrcpy/src/options/1_22.ts
@@ -38,7 +38,7 @@ export class AdbScrcpyOptions1_22 extends AdbScrcpyOptions<
         return AdbScrcpyOptions1_16.createConnection(
             adb,
             {
-                scid: -1, // Not Supported
+                scid: undefined, // Not Supported
                 video: true, // Always enabled
                 audio: false, // Not Supported
                 control: this.value.control,
diff --git a/libraries/adb-scrcpy/src/options/2_0.ts b/libraries/adb-scrcpy/src/options/2_0.ts
index 6c7b972e..c08bc9df 100644
--- a/libraries/adb-scrcpy/src/options/2_0.ts
+++ b/libraries/adb-scrcpy/src/options/2_0.ts
@@ -5,6 +5,7 @@ import type {
     ScrcpyOptions1_16Impl,
     ScrcpyOptions2_0Impl,
 } from "@yume-chan/scrcpy";
+import { toScrcpyOptionValue } from "@yume-chan/scrcpy";
 
 import { AdbScrcpyClient, AdbScrcpyExitedError } from "../client.js";
 import type { AdbScrcpyConnection } from "../connection.js";
@@ -77,7 +78,7 @@ export class AdbScrcpyOptions2_0 extends AdbScrcpyOptions<
         return AdbScrcpyOptions1_16.createConnection(
             adb,
             {
-                scid: this.value.scid.value,
+                scid: toScrcpyOptionValue(this.value.scid, undefined),
                 video: true, // Always enabled
                 audio: this.value.audio,
                 control: this.value.control,
diff --git a/libraries/adb-scrcpy/src/options/2_1.ts b/libraries/adb-scrcpy/src/options/2_1.ts
index acc0cee3..827857b1 100644
--- a/libraries/adb-scrcpy/src/options/2_1.ts
+++ b/libraries/adb-scrcpy/src/options/2_1.ts
@@ -4,6 +4,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyOptions2_1Impl,
 } from "@yume-chan/scrcpy";
+import { toScrcpyOptionValue } from "@yume-chan/scrcpy";
 
 import type { AdbScrcpyConnection } from "../connection.js";
 
@@ -44,7 +45,7 @@ export class AdbScrcpyOptions2_1 extends AdbScrcpyOptions<
         return AdbScrcpyOptions1_16.createConnection(
             adb,
             {
-                scid: this.value.scid.value,
+                scid: toScrcpyOptionValue(this.value.scid, undefined),
                 video: this.value.video,
                 audio: this.value.audio,
                 control: this.value.control,