diff --git a/lua/user/comment.lua b/lua/user/comment.lua
index 2fa4a56..780581e 100644
--- a/lua/user/comment.lua
+++ b/lua/user/comment.lua
@@ -4,19 +4,6 @@ if not status_ok then
 end
 
 comment.setup {
-  pre_hook = function(ctx)
-    local U = require "Comment.utils"
-
-    local location = nil
-    if ctx.ctype == U.ctype.block then
-      location = require("ts_context_commentstring.utils").get_cursor_location()
-    elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then
-      location = require("ts_context_commentstring.utils").get_visual_start_location()
-    end
-
-    return require("ts_context_commentstring.internal").calculate_commentstring {
-      key = ctx.ctype == U.ctype.line and "__default" or "__multiline",
-      location = location,
-    }
-  end,
+  ignore = "^$",
+  pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
 }