diff --git a/clients/lsp-gdscript.el b/clients/lsp-gdscript.el
index e25de91667..e9448bc881 100644
--- a/clients/lsp-gdscript.el
+++ b/clients/lsp-gdscript.el
@@ -53,7 +53,7 @@
 
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-gdscript-tcp-connect-to-port)
-                  :major-modes '(gdscript-mode)
+                  :activation-fn (lsp-activate-on "gdscript")
                   :server-id 'gdscript))
 
 (lsp-consistency-check lsp-gdscript)
diff --git a/clients/lsp-lua.el b/clients/lsp-lua.el
index 15c07a191c..754cf65747 100644
--- a/clients/lsp-lua.el
+++ b/clients/lsp-lua.el
@@ -74,7 +74,7 @@
                                                          ,@lsp-clients-emmy-lua-args
                                                          ,lsp-clients-emmy-lua-jar-path)))
                                         #'lsp-clients-emmy-lua-test)
-  :major-modes '(lua-mode)
+  :activation-fn (lsp-activate-on "lua")
   :server-id 'emmy-lua
   :priority -1
   :notification-handlers (lsp-ht ("emmy/progressReport" #'ignore))))
@@ -575,7 +575,7 @@ and `../lib` ,exclude `../lib/temp`.
                                                          ,@lsp-clients-lua-language-server-args
                                                          ,lsp-clients-lua-language-server-main-location)))
                                         #'lsp-clients-lua-language-server-test)
-  :major-modes '(lua-mode)
+  :activation-fn (lsp-activate-on "lua")
   :priority -2
   :server-id 'lua-language-server
   :download-server-fn #'lsp-lua-language-server-install-latest))
@@ -611,7 +611,7 @@ and `../lib` ,exclude `../lib/temp`.
                                           (or lsp-clients-lua-lsp-server-install-dir
                                               (f-join lsp-clients-luarocks-bin-dir "lua-lsp")))
                                         #'lsp-clients-lua-lsp-test)
-  :major-modes '(lua-mode)
+  :activation-fn (lsp-activate-on "lua")
   :priority -3
   :server-id 'lsp-lua-lsp))
 
@@ -690,7 +690,7 @@ and `../lib` ,exclude `../lib/temp`.
                                                          ,@lsp-clients-lua-language-server-args
                                                          ,lsp-lua-roblox-language-server-main-location)))
                                         #'lsp-lua-roblox-language-server-test)
-  :major-modes '(lua-mode)
+  :activation-fn (lsp-activate-on "lua")
   :priority -4
   :server-id 'lua-roblox-language-server
   :download-server-fn #'lsp-lua-roblox-language-server-install))
diff --git a/lsp-mode.el b/lsp-mode.el
index e9948baa1f..e4b518e821 100644
--- a/lsp-mode.el
+++ b/lsp-mode.el
@@ -819,6 +819,7 @@ Changes take effect only when a new session is started."
     (less-mode . "less")
     (less-css-mode . "less")
     (lua-mode . "lua")
+    (lua-ts-mode . "lua")
     (sass-mode . "sass")
     (ssass-mode . "sass")
     (scss-mode . "scss")
@@ -894,6 +895,7 @@ Changes take effect only when a new session is started."
     (cmake-ts-mode . "cmake")
     (purescript-mode . "purescript")
     (gdscript-mode . "gdscript")
+    (gdscript-ts-mode . "gdscript")
     (perl-mode . "perl")
     (cperl-mode . "perl")
     (robot-mode . "robot")
@@ -5926,6 +5928,7 @@ Request codeAction/resolve for more info if server supports."
     (json-mode                  . js-indent-level)                  ; JSON
     (json-ts-mode               . json-ts-mode-indent-offset)
     (lua-mode                   . lua-indent-level)                 ; Lua
+    (lua-ts-mode                . lua-ts-mode-indent-offset)
     (nxml-mode                  . nxml-child-indent)                ; XML
     (objc-mode                  . c-basic-offset)                   ; Objective C
     (pascal-mode                . pascal-indent-level)              ; Pascal