diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index accbdf8df..13d0f2e60 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1307,8 +1307,10 @@ bool callUniLinksUriHandler(Uri uri) {
   // new connection
   if (uri.authority == "connection" && uri.path.startsWith("/new/")) {
     final peerId = uri.path.substring("/new/".length);
+    var param = uri.queryParameters;
+    String? switch_uuid = param["switch_uuid"];
     Future.delayed(Duration.zero, () {
-      rustDeskWinManager.newRemoteDesktop(peerId);
+      rustDeskWinManager.newRemoteDesktop(peerId, switch_uuid: switch_uuid);
     });
     return true;
   }
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index 061c3293f..95ecde6e9 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -199,12 +199,6 @@ class FfiModel with ChangeNotifier {
         parent.target?.serverModel.setShowElevation(show);
       } else if (name == 'cancel_msgbox') {
         cancelMsgBox(evt, peerId);
-      } else if (name == 'switch_sides') {
-        final peer_id = evt['peer_id'].toString();
-        final uuid = evt['uuid'].toString();
-        Future.delayed(Duration.zero, () {
-          rustDeskWinManager.newRemoteDesktop(peer_id, switch_uuid: uuid);
-        });
       } else if (name == 'switch_back') {
         final peer_id = evt['peer_id'].toString();
         await bind.sessionSwitchSides(id: peer_id);
diff --git a/src/core_main.rs b/src/core_main.rs
index 9083efe0e..76795576e 100644
--- a/src/core_main.rs
+++ b/src/core_main.rs
@@ -298,6 +298,13 @@ fn core_main_invoke_new_connection(mut args: std::env::Args) -> Option<Vec<Strin
         eprintln!("please provide a valid peer id");
         return None;
     }
+    let mut switch_uuid = None;
+    while let Some(item) = args.next() {
+        if item == "--switch_uuid" {
+            switch_uuid = args.next();
+        }
+    }
+
     #[cfg(target_os = "linux")]
     {
         use crate::dbus::invoke_new_connection;
@@ -315,8 +322,14 @@ fn core_main_invoke_new_connection(mut args: std::env::Args) -> Option<Vec<Strin
     }
     #[cfg(windows)]
     {
+        let switch_uuid = switch_uuid.map_or("".to_string(), |p| format!("switch_uuid={}", p));
+        let params = vec![switch_uuid].join("&");
+        let params_flag = if params.is_empty() { "" } else { "?" };
         use winapi::um::winuser::WM_USER;
-        let uni_links = format!("rustdesk://connection/new/{}", peer_id);
+        let uni_links = format!(
+            "rustdesk://connection/new/{}{}{}",
+            peer_id, params_flag, params
+        );
         let res = crate::platform::send_message_to_hnwd(
             "FLUTTER_RUNNER_WIN32_WINDOW",
             "RustDesk",
diff --git a/src/flutter.rs b/src/flutter.rs
index 0b8cef704..02c99ec89 100644
--- a/src/flutter.rs
+++ b/src/flutter.rs
@@ -612,17 +612,3 @@ pub fn set_cur_session_id(id: String) {
         *CUR_SESSION_ID.write().unwrap() = id;
     }
 }
-
-pub fn switch_sides(peer_id: &str, uuid: &Bytes) {
-    if let Some(stream) = GLOBAL_EVENT_STREAM.read().unwrap().get(APP_TYPE_MAIN) {
-        if let Ok(uuid) = uuid::Uuid::from_slice(uuid.to_vec().as_ref()) {
-            let uuid = uuid.to_string();
-            let data = HashMap::from([
-                ("name", "switch_sides"),
-                ("peer_id", peer_id),
-                ("uuid", &uuid),
-            ]);
-            stream.add(serde_json::ser::to_string(&data).unwrap_or("".into()));
-        }
-    }
-}
diff --git a/src/server/connection.rs b/src/server/connection.rs
index e4ab1b22e..716484912 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1573,8 +1573,16 @@ impl Connection {
                     },
                     #[cfg(feature = "flutter")]
                     Some(misc::Union::SwitchSidesRequest(s)) => {
-                        crate::flutter::switch_sides(&self.lr.my_id, &s.uuid);
-                        return false;
+                        if let Ok(uuid) = uuid::Uuid::from_slice(&s.uuid.to_vec()[..]) {
+                            crate::run_me(vec![
+                                "--connect",
+                                &self.lr.my_id,
+                                "--switch_uuid",
+                                uuid.to_string().as_ref(),
+                            ])
+                            .ok();
+                            return false;
+                        }
                     }
                     _ => {}
                 },