diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go
index 01c058e6..246186b6 100644
--- a/internal/db/models/node_cluster_dao.go
+++ b/internal/db/models/node_cluster_dao.go
@@ -1135,11 +1135,12 @@ func (this *NodeClusterDAO) FindClusterUAMPolicy(tx *dbs.Tx, clusterId int64, ca
 		return nil, err
 	}
 
+	var policy = nodeconfigs.NewUAMPolicy()
+
 	if IsNull(uamJSON) {
-		return nodeconfigs.DefaultUAMPolicy, nil
+		return policy, nil
 	}
 
-	var policy = &nodeconfigs.UAMPolicy{}
 	err = json.Unmarshal(uamJSON, policy)
 	if err != nil {
 		return nil, err
diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go
index e8a1009c..af7a25bb 100644
--- a/internal/db/models/node_dao.go
+++ b/internal/db/models/node_dao.go
@@ -1174,7 +1174,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared
 
 		// UAM
 		if IsNotNull(nodeCluster.Uam) {
-			var uamPolicy = &nodeconfigs.UAMPolicy{}
+			var uamPolicy = nodeconfigs.NewUAMPolicy()
 			err = json.Unmarshal(nodeCluster.Uam, uamPolicy)
 			if err != nil {
 				return nil, err
diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go
index 73042634..413edd04 100644
--- a/internal/rpc/services/service_node_cluster.go
+++ b/internal/rpc/services/service_node_cluster.go
@@ -1130,15 +1130,15 @@ func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Con
 	}
 
 	// UAM
+	var uamPolicy = nodeconfigs.NewUAMPolicy()
 	if models.IsNotNull(cluster.Uam) {
-		var uamPolicy = &nodeconfigs.UAMPolicy{}
 		err = json.Unmarshal(cluster.Uam, uamPolicy)
 		if err != nil {
 			return nil, err
 		}
 		result.UamIsOn = uamPolicy.IsOn
 	} else {
-		result.UamIsOn = nodeconfigs.DefaultUAMPolicy.IsOn
+		result.UamIsOn = uamPolicy.IsOn
 	}
 
 	// HTTP CC
@@ -1292,7 +1292,7 @@ func (this *NodeClusterService) UpdateNodeClusterUAMPolicy(ctx context.Context,
 		return nil, err
 	}
 
-	var uamPolicy = &nodeconfigs.UAMPolicy{}
+	var uamPolicy = nodeconfigs.NewUAMPolicy()
 	err = json.Unmarshal(req.UamPolicyJSON, uamPolicy)
 	if err != nil {
 		return nil, err