diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index ef2075c..0421190 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -120,7 +120,44 @@ require("lualine").setup({
 				color = { fg = "#ff9e64" },
 			},
 			{
-				require("mcphub.extensions.lualine"),
+				function()
+					-- Check if MCPHub is loaded
+					if not vim.g.loaded_mcphub then
+						return "󰐻 -"
+					end
+
+					local count = vim.g.mcphub_servers_count or 0
+					local status = vim.g.mcphub_status or "stopped"
+					local executing = vim.g.mcphub_executing
+
+					-- Show "-" when stopped
+					if status == "stopped" then
+						return "󰐻 -"
+					end
+
+					-- Show spinner when executing, starting, or restarting
+					if executing or status == "starting" or status == "restarting" then
+						local frames = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }
+						local frame = math.floor(vim.loop.now() / 100) % #frames + 1
+						return "󰐻 " .. frames[frame]
+					end
+
+					return "󰐻 " .. count
+				end,
+				color = function()
+					if not vim.g.loaded_mcphub then
+						return { fg = "#6c7086" } -- Gray for not loaded
+					end
+
+					local status = vim.g.mcphub_status or "stopped"
+					if status == "ready" or status == "restarted" then
+						return { fg = "#50fa7b" } -- Green for connected
+					elseif status == "starting" or status == "restarting" then
+						return { fg = "#ffb86c" } -- Orange for connecting
+					else
+						return { fg = "#ff5555" } -- Red for error/stopped
+					end
+				end,
 			},
 			{
 				require("noice").api.status.search.get,