diff --git a/src/server/input_service.rs b/src/server/input_service.rs
index 187afc5a5..d9b37feab 100644
--- a/src/server/input_service.rs
+++ b/src/server/input_service.rs
@@ -6,6 +6,7 @@ use dispatch::Queue;
 use enigo::{Enigo, Key, KeyboardControllable, MouseButton, MouseControllable};
 use hbb_common::{config::COMPRESS_LEVEL, get_time, protobuf::EnumOrUnknown};
 use rdev::{simulate, EventType, Key as RdevKey};
+use std::time::Duration;
 use std::{
     convert::TryFrom,
     ops::Sub,
@@ -753,15 +754,14 @@ fn rdev_key_down_or_up(key: RdevKey, down_or_up: bool) {
         true => EventType::KeyPress(key),
         false => EventType::KeyRelease(key),
     };
-    let delay = std::time::Duration::from_millis(20);
     match simulate(&event_type) {
         Ok(()) => (),
         Err(_simulate_error) => {
             log::error!("Could not send {:?}", &event_type);
         }
     }
-    // Let ths OS catchup (at least MacOS)
-    std::thread::sleep(delay);
+    #[cfg(target_os = "macos")]
+    std::thread::sleep(Duration::from_millis(20));
 }
 
 fn rdev_key_click(key: RdevKey) {
@@ -769,8 +769,7 @@ fn rdev_key_click(key: RdevKey) {
     rdev_key_down_or_up(key, false);
 }
 
-fn sync_status(evt: &KeyEvent) -> (bool, bool) {
-    /* todo! Shift+delete */
+fn sync_status(evt: &KeyEvent) {
     let mut en = ENIGO.lock().unwrap();
 
     // remote caps status
@@ -808,7 +807,18 @@ fn sync_status(evt: &KeyEvent) -> (bool, bool) {
             _ => click_numlock,
         }
     };
-    return (click_capslock, click_numlock);
+
+    if click_capslock {
+        #[cfg(not(target_os = "macos"))]
+        en.key_click(enigo::Key::CapsLock);
+        #[cfg(target_os = "macos")]
+        en.key_down(enigo::Key::CapsLock);
+    }
+
+    if click_numlock {
+        #[cfg(not(target_os = "macos"))]
+        en.key_click(enigo::Key::NumLock);
+    }
 }
 
 fn map_keyboard_mode(evt: &KeyEvent) {
@@ -816,25 +826,12 @@ fn map_keyboard_mode(evt: &KeyEvent) {
     #[cfg(windows)]
     crate::platform::windows::try_change_desktop();
 
-    let (click_capslock, click_numlock) = sync_status(evt);
-
     // Wayland
     #[cfg(target_os = "linux")]
     if !*IS_X11.lock().unwrap() {
         let mut en = ENIGO.lock().unwrap();
         let code = evt.chr() as u16;
 
-        #[cfg(not(target_os = "macos"))]
-        if click_capslock {
-            en.key_click(enigo::Key::CapsLock);
-        }
-        #[cfg(not(target_os = "macos"))]
-        if click_numlock {
-            en.key_click(enigo::Key::NumLock);
-        }
-        #[cfg(target_os = "macos")]
-        en.key_down(enigo::Key::CapsLock);
-
         if evt.down {
             en.key_down(enigo::Key::Raw(code)).ok();
         } else {
@@ -843,35 +840,14 @@ fn map_keyboard_mode(evt: &KeyEvent) {
         return;
     }
 
-    #[cfg(not(target_os = "macos"))]
-    if click_capslock {
-        rdev_key_click(RdevKey::CapsLock);
-    }
-    #[cfg(not(target_os = "macos"))]
-    if click_numlock {
-        rdev_key_click(RdevKey::NumLock);
-    }
-    #[cfg(target_os = "macos")]
-    if evt.down && click_capslock {
-        rdev_key_down_or_up(RdevKey::CapsLock, evt.down);
-    }
-
     rdev_key_down_or_up(RdevKey::Unknown(evt.chr()), evt.down);
     return;
 }
 
 fn legacy_keyboard_mode(evt: &KeyEvent) {
-    let (click_capslock, click_numlock) = sync_status(evt);
-
     #[cfg(windows)]
     crate::platform::windows::try_change_desktop();
     let mut en = ENIGO.lock().unwrap();
-    if click_capslock {
-        en.key_click(Key::CapsLock);
-    }
-    if click_numlock {
-        en.key_click(Key::NumLock);
-    }
     // disable numlock if press home etc when numlock is on,
     // because we will get numpad value (7,8,9 etc) if not
     #[cfg(windows)]
@@ -1001,6 +977,9 @@ pub fn handle_key_(evt: &KeyEvent) {
         return;
     }
 
+    if evt.down {
+        sync_status(evt)
+    }
     match evt.mode.unwrap() {
         KeyboardMode::Map => {
             map_keyboard_mode(evt);