diff --git a/autoload/lsp/capabilities.vim b/autoload/lsp/capabilities.vim
index 9186a9b0..c1fe839a 100644
--- a/autoload/lsp/capabilities.vim
+++ b/autoload/lsp/capabilities.vim
@@ -394,6 +394,9 @@ export def GetClientCaps(): dict<any>
 	dynamicRegistration: false,
 	prepareSupport: false,
       },
+      selectionRange: {
+	dynamicRegistration: false,
+      },
       signatureHelp: {
 	dynamicRegistration: false,
 	signatureInformation: {
diff --git a/autoload/lsp/inlayhints.vim b/autoload/lsp/inlayhints.vim
index 34daee87..45848c3b 100644
--- a/autoload/lsp/inlayhints.vim
+++ b/autoload/lsp/inlayhints.vim
@@ -129,6 +129,7 @@ export def BufferInit(lspserver: dict<any>, bnr: number)
 
   # Inlays hints are disabled
   if !opt.lspOptions.showInlayHints
+      || !lspserver.featureEnabled('inlayHint')
     return
   endif
 
@@ -174,8 +175,9 @@ export def InlayHintsEnable()
       continue
     endif
     for lspserver in lspservers
-      if !lspserver.isInlayHintProvider &&
-	  !lspserver.isClangdInlayHintsProvider
+      if !lspserver.featureEnabled('inlayHint')
+	  || (!lspserver.isInlayHintProvider &&
+	      !lspserver.isClangdInlayHintsProvider)
 	continue
       endif
       BufferInit(lspserver, binfo.bufnr)