diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08da3335..31fcd1e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Improve /doctor command to show clearly model used + login providers.
+- Fix disabled mcp tools not showing properly in mcp details UI.
 
 ## 0.102.0
 
diff --git a/src/eca/features/tools.clj b/src/eca/features/tools.clj
index a959a162..73aa16b0 100644
--- a/src/eca/features/tools.clj
+++ b/src/eca/features/tools.clj
@@ -247,7 +247,10 @@
                                           :status (:status server)} metrics)
   (messenger/tool-server-updated messenger (-> server
                                                (assoc :type :mcp)
-                                               (update :tools #(mapv tool-status-fn %)))))
+                                               (update :tools
+                                                       #(mapv (comp tool-status-fn
+                                                                    (fn [t] (assoc t :server {:name (:name server)})))
+                                                              %)))))
 
 (defn init-servers! [db* messenger config metrics]
   (let [default-agent (get config :defaultAgent)