diff --git a/axhub-common/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java b/axhub-common/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java
index 9492b45..be3bd3e 100644
--- a/axhub-common/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java
+++ b/axhub-common/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java
@@ -66,21 +66,7 @@ public class ToolMetadata {
     @Builder.Default
     private Boolean requiresApproval = false;
 
-    public boolean isVisible() {
-        return visible != null ? visible : true;
-    }
 
-    public boolean isRegistered() {
-        return isRegistered != null ? isRegistered : true;
-    }
-    
-    public void setRegistered(Boolean isRegistered) {
-        this.isRegistered = isRegistered;
-    }
-
-    public boolean isRequiresApproval() {
-        return requiresApproval != null ? requiresApproval : false;
-    }
 
     // 3. 연동 아키텍처 구분 (DIRECT / MCI_EAI)
     private String integrationType;   // 연동 타입: "DIRECT" 또는 "MCI_EAI"
diff --git a/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java b/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java
index c0ee30c..e9f0dde 100644
--- a/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java
+++ b/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/dto/ToolMetadata.java
@@ -66,21 +66,7 @@ public class ToolMetadata {
     @Builder.Default
     private Boolean requiresApproval = false;
 
-    public boolean isVisible() {
-        return visible != null ? visible : true;
-    }
 
-    public boolean isRegistered() {
-        return isRegistered != null ? isRegistered : true;
-    }
-    
-    public void setRegistered(Boolean isRegistered) {
-        this.isRegistered = isRegistered;
-    }
-
-    public boolean isRequiresApproval() {
-        return requiresApproval != null ? requiresApproval : false;
-    }
 
     // 3. 연동 아키텍처 구분 (DIRECT / MCI_EAI)
     private String integrationType;   // 연동 타입: "DIRECT" 또는 "MCI_EAI"
diff --git a/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/presentation/McpRouterController.java b/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/presentation/McpRouterController.java
index 5efc440..3db25da 100644
--- a/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/presentation/McpRouterController.java
+++ b/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/presentation/McpRouterController.java
@@ -130,7 +130,7 @@ public class McpRouterController {
                         
                 if (localTools != null) {
                     for (ToolMetadata t : localTools) {
-                        if (!t.isRegistered() && t.isVisible() && !knownTools.contains(t.getToolName())) {
+                        if (!Boolean.TRUE.equals(t.getIsRegistered()) && Boolean.TRUE.equals(t.getVisible()) && !knownTools.contains(t.getToolName())) {
                             activeTools.add(t);
                             knownTools.add(t.getToolName());
                         }
diff --git a/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/dto/ToolMetadata.java b/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/dto/ToolMetadata.java
index 6a767b5..009596c 100644
--- a/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/dto/ToolMetadata.java
+++ b/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/dto/ToolMetadata.java
@@ -48,20 +48,6 @@ public class ToolMetadata {
     @Builder.Default
     private Boolean requiresApproval = false;
 
-    public boolean isVisible() {
-        return visible != null ? visible : true;
-    }
 
-    public boolean isRegistered() {
-        return isRegistered != null ? isRegistered : true;
-    }
-    
-    public void setRegistered(Boolean isRegistered) {
-        this.isRegistered = isRegistered;
-    }
-
-    public boolean isRequiresApproval() {
-        return requiresApproval != null ? requiresApproval : false;
-    }
 
 }
\ No newline at end of file
diff --git a/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/service/ToolRegistryHeartbeatSender.java b/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/service/ToolRegistryHeartbeatSender.java
index 23c750c..221f9e6 100644
--- a/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/service/ToolRegistryHeartbeatSender.java
+++ b/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/service/ToolRegistryHeartbeatSender.java
@@ -100,7 +100,7 @@ public class ToolRegistryHeartbeatSender {
                     
                     boolean isVisible = functionAnnotation.visible();
                     meta.setVisible(isVisible);
-                    meta.setRegistered(isRegister);
+                    meta.setIsRegistered(isRegister);
                     meta.setRequiresApproval(functionAnnotation.requiresApproval());
                     
                     Map<String, String> prompts = new HashMap<>();