diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml
index 9c195bd..ad14bef 100644
--- a/user/kakoune/kak-lsp.toml
+++ b/user/kakoune/kak-lsp.toml
@@ -121,21 +121,13 @@ stubs = [
 [language_server.rust-analyzer]
 filetypes = ["rust"]
 roots = ["Cargo.toml"]
-command = "sh"
-args = [
-    "-c",
-    """
-        if path=$(rustup which rust-analyzer 2>/dev/null); then
-            "$path"
-        else
-            rust-analyzer
-        fi
-    """,
-]
+command = "rust-analyzer"
+single_instance = false
+
 [language_server.rust-analyzer.settings.rust-analyzer]
 # See https://rust-analyzer.github.io/manual.html#configuration
 # cargo.features = []
-checkOnSave.command = "clippy"
+check.command = "clippy"
 hoverActions.enable = false # kak-lsp doesn't support this at the moment
 
 [language_server.godot]