diff --git a/.config/nvim/lua/plugins/avante.lua b/.config/nvim/lua/plugins/avante.lua
index dd17195..2730996 100644
--- a/.config/nvim/lua/plugins/avante.lua
+++ b/.config/nvim/lua/plugins/avante.lua
@@ -1,6 +1,9 @@
 require("avante").setup({
 	provider = "copilot",
-	copilot = { model = "claude-3.7-sonnet" },
+	copilot = {
+		model = "claude-3.7-sonnet",
+		timeout = 120000,
+	},
 	-- provider = "claude",
 	-- claude = {
 	-- 	api_key_name = "cmd:secret-tool lookup description ANTHROPIC_API_KEY",
@@ -15,7 +18,7 @@ require("avante").setup({
 
 	system_prompt = function()
 		local hub = require("mcphub").get_hub_instance()
-		return hub:get_active_servers_prompt()
+		return hub and hub:get_active_servers_prompt() or ""
 	end,
 	custom_tools = function()
 		return {
diff --git a/.config/nvim/lua/plugins/mcphub.lua b/.config/nvim/lua/plugins/mcphub.lua
index 9769472..7cfcd1d 100644
--- a/.config/nvim/lua/plugins/mcphub.lua
+++ b/.config/nvim/lua/plugins/mcphub.lua
@@ -1,4 +1,9 @@
 require("mcphub").setup({
 	use_bundled_binary = true,
 	auto_approve = true,
+	extensions = {
+		avante = {
+			make_slash_commands = true,
+		},
+	},
 })