diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java
index d85572dbb..2ffdea0b9 100644
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java
@@ -106,8 +106,6 @@ public class PromptHelper {
             }
             if (StringUtils.isNotEmpty(metric.getDefaultAgg())) {
                 metricStr.append(" AGGREGATE '" + metric.getDefaultAgg().toUpperCase() + "'");
-            } else {
-                metricStr.append(" AGGREGATE 'NONE'");
             }
             metricStr.append(">");
             metrics.add(metricStr.toString());
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
index fc69b8ded..1216dae4e 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
@@ -104,11 +104,11 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
             } else {
                 MetricResp metricRespByBizName = bizNameMap.get(metric.getBizName());
                 MetricResp metricRespByName = nameMap.get(metric.getName());
-                if (null != metricRespByBizName && isChange(metric, metricRespByBizName)) {
+                if (null != metricRespByBizName) {
                     metric.setId(metricRespByBizName.getId());
                     this.updateMetric(metric, user);
                 } else {
-                    if (null != metricRespByName && isChange(metric, metricRespByName)) {
+                    if (null != metricRespByName) {
                         metric.setId(metricRespByName.getId());
                         this.updateMetric(metric, user);
                     }
@@ -819,7 +819,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         return modelResps.stream().map(ModelResp::getId).collect(Collectors.toSet());
     }
 
-    private boolean isChange(MetricReq metricReq, MetricResp metricResp) {
+    private boolean isNameChange(MetricReq metricReq, MetricResp metricResp) {
         boolean isNameChange = !metricReq.getName().equals(metricResp.getName());
         return isNameChange;
     }
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
index 9643f4ade..69f4d5147 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
@@ -142,8 +142,12 @@ public class ModelServiceImpl implements ModelService {
     @Override
     @Transactional
     public ModelResp updateModel(ModelReq modelReq, User user) throws Exception {
-        // checkParams(modelReq);
+        // Comment out below checks for now, they seem unnecessary and
+        // lead to unexpected exception in updating model
+        /*
+        checkParams(modelReq);
         checkRelations(modelReq);
+         */
         ModelDO modelDO = modelRepository.getModelById(modelReq.getId());
         ModelConverter.convert(modelDO, modelReq, user);
         modelRepository.updateModel(modelDO);