diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index c31f294..630ba41 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -69,8 +69,9 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', ',d', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>'   , opts)
 
   if client.resolved_capabilities.document_range_formatting then
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', '<cmd>lua format_range_operator()<CR>', opts)
-  elseif client.resolved_capabilities.document_formatting then
+    vim.api.nvim_buf_set_keymap(bufnr, 'x', 'gq', '<cmd>lua format_range_operator()<CR>', opts)
+  end
+  if client.resolved_capabilities.document_formatting then
     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
   end
 
@@ -109,7 +110,8 @@ local on_attach = function(client, bufnr)
 
   if client.name == 'tsserver' then
     -- Disable tsserver formatting as we plan on formatting via null-ls
-    client.resolved_capabilities.document_formatting = false
+    client.resolved_capabilities.document_formatting       = false
+    client.resolved_capabilities.document_range_formatting = false
 
     ts_utils.setup {
       debug                          = false,