diff --git a/src/common.rs b/src/common.rs
index 13599045e..d5390fe69 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -40,15 +40,6 @@ pub fn valid_for_numlock(evt: &KeyEvent) -> bool {
     }
 }
 
-#[inline]
-pub fn valid_for_capslock(evt: &KeyEvent) -> bool {
-    if let Some(key_event::Union::chr(ch)) = evt.union {
-        ch >= 'a' as u32 && ch <= 'z' as u32
-    } else {
-        false
-    }
-}
-
 pub fn create_clipboard_msg(content: String) -> Message {
     let bytes = content.into_bytes();
     let compressed = compress_func(&bytes, COMPRESS_LEVEL);
@@ -467,4 +458,3 @@ pub fn is_ip(id: &str) -> bool {
         .unwrap()
         .is_match(id)
 }
-
diff --git a/src/server/input_service.rs b/src/server/input_service.rs
index ba34772a5..657790aa2 100644
--- a/src/server/input_service.rs
+++ b/src/server/input_service.rs
@@ -580,11 +580,9 @@ fn handle_key_(evt: &KeyEvent) {
         }
     }
     #[cfg(not(target_os = "macos"))]
-    if crate::common::valid_for_capslock(evt) {
-        if has_cap != en.get_key_state(Key::CapsLock) {
-            en.key_down(Key::CapsLock).ok();
-            en.key_up(Key::CapsLock);
-        }
+    if has_cap != en.get_key_state(Key::CapsLock) {
+        en.key_down(Key::CapsLock).ok();
+        en.key_up(Key::CapsLock);
     }
     #[cfg(windows)]
     if crate::common::valid_for_numlock(evt) {
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 33d3a013b..48efad17e 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -1031,17 +1031,11 @@ impl Handler {
         {
             key_event.modifiers.push(ControlKey::Meta.into());
         }
-        /*
-        if crate::is_control_key(&key_event, &ControlKey::CapsLock) {
-            return;
-        } else if get_key_state(enigo::Key::CapsLock) && common::valid_for_capslock(&key_event) {
+        if get_key_state(enigo::Key::CapsLock) {
             key_event.modifiers.push(ControlKey::CapsLock.into());
         }
-        */
         if self.peer_platform() != "Mac OS" {
-            if crate::is_control_key(&key_event, &ControlKey::NumLock) {
-                return;
-            } else if get_key_state(enigo::Key::NumLock) && common::valid_for_numlock(&key_event) {
+            if get_key_state(enigo::Key::NumLock) && common::valid_for_numlock(&key_event) {
                 key_event.modifiers.push(ControlKey::NumLock.into());
             }
         }