diff --git a/src/lang/pl.rs b/src/lang/pl.rs
index 0e2616a80..ffe94432d 100644
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -387,7 +387,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Show RustDesk", "Pokaż RustDesk"),
         ("This PC", "Ten komputer"),
         ("or", "albo"),
-        ("Continue with", "Kontynuuj z"),""),
+        ("Continue with", "Kontynuuj z"),
         ("Elevate", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/server/input_service.rs b/src/server/input_service.rs
index af4b7d853..af9441ae4 100644
--- a/src/server/input_service.rs
+++ b/src/server/input_service.rs
@@ -280,13 +280,6 @@ fn get_modifier_state(key: Key, en: &mut Enigo) -> bool {
 }
 
 pub fn handle_mouse(evt: &MouseEvent, conn: i32) {
-    #[cfg(target_os = "macos")]
-    if !*IS_SERVER {
-        // having GUI, run main GUI thread, otherwise crash
-        let evt = evt.clone();
-        QUEUE.exec_async(move || handle_mouse_(&evt, conn));
-        return;
-    }
     if !active_mouse_(conn) {
         return;
     }
@@ -300,6 +293,13 @@ pub fn handle_mouse(evt: &MouseEvent, conn: i32) {
             y: evt.y,
         };
     }
+    #[cfg(target_os = "macos")]
+    if !*IS_SERVER {
+        // having GUI, run main GUI thread, otherwise crash
+        let evt = evt.clone();
+        QUEUE.exec_async(move || handle_mouse_(&evt));
+        return;
+    }
     #[cfg(windows)]
     crate::portable_service::client::handle_mouse(evt);
     #[cfg(not(windows))]
diff --git a/src/server/portable_service.rs b/src/server/portable_service.rs
index 48cdcbe51..21b501f1e 100644
--- a/src/server/portable_service.rs
+++ b/src/server/portable_service.rs
@@ -16,7 +16,7 @@ use std::{
     mem::size_of,
     ops::{Deref, DerefMut},
     sync::{Arc, Mutex},
-    time::{Duration, Instant},
+    time::Duration,
 };
 use winapi::{
     shared::minwindef::{BOOL, FALSE, TRUE},