diff --git a/lua/astrocommunity/motion/mini-surround/init.lua b/lua/astrocommunity/motion/mini-surround/init.lua
index 3c386664f..461b47a79 100644
--- a/lua/astrocommunity/motion/mini-surround/init.lua
+++ b/lua/astrocommunity/motion/mini-surround/init.lua
@@ -12,16 +12,18 @@ return {
         end,
       },
     },
-    keys = function(plugin, keys)
+    keys = function(_, keys)
+      local plugin = require("lazy.core.config").spec.plugins["mini.surround"]
+      local opts = require("lazy.core.plugin").values(plugin, "opts", false) -- resolve mini.clue options
       -- Populate the keys based on the user's options
       local mappings = {
-        { plugin.opts.mappings.add, desc = "Add surrounding", mode = { "n", "v" } },
-        { plugin.opts.mappings.delete, desc = "Delete surrounding" },
-        { plugin.opts.mappings.find, desc = "Find right surrounding" },
-        { plugin.opts.mappings.find_left, desc = "Find left surrounding" },
-        { plugin.opts.mappings.highlight, desc = "Highlight surrounding" },
-        { plugin.opts.mappings.replace, desc = "Replace surrounding" },
-        { plugin.opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
+        { opts.mappings.add, desc = "Add surrounding", mode = { "n", "v" } },
+        { opts.mappings.delete, desc = "Delete surrounding" },
+        { opts.mappings.find, desc = "Find right surrounding" },
+        { opts.mappings.find_left, desc = "Find left surrounding" },
+        { opts.mappings.highlight, desc = "Highlight surrounding" },
+        { opts.mappings.replace, desc = "Replace surrounding" },
+        { opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
       }
       mappings = vim.tbl_filter(function(m) return m[1] and #m[1] > 0 end, mappings)
       return vim.list_extend(mappings, keys)