diff --git a/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/ToolRegistryHeartbeatSender.java b/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/ToolRegistryHeartbeatSender.java
index e897d7f7..74d29baa 100644
--- a/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/ToolRegistryHeartbeatSender.java
+++ b/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/ToolRegistryHeartbeatSender.java
@@ -174,7 +174,9 @@ public class ToolRegistryHeartbeatSender {
 
                     enrichWithDefinition(meta, rawSubToolName, hintAnnotation);
 
-                    registeredTools.add(meta);
+                    if (isRegister) {
+                        registeredTools.add(meta);
+                    }
                     allScannedTools.add(meta);
                     log.info(" [HeartbeatSender] 도구 메타데이터 생성: {} (isRegistered: {})", meta.getUid(), isRegister);
                 }