diff --git a/grpc_api/cc_agent.go b/grpc_api/cc_agent.go
index 4be52574..a1ab972d 100644
--- a/grpc_api/cc_agent.go
+++ b/grpc_api/cc_agent.go
@@ -1,6 +1,7 @@
 package grpc_api
 
 import (
+	"cmp"
 	"context"
 	"fmt"
 	"strconv"
@@ -419,6 +420,7 @@ func (api *agent) UpdateAgentStatus(ctx context.Context, in *engine.AgentStatusR
 			AgentID:      agentId,
 			OnDemand:     in.GetOnDemand(),
 			OnlineStatus: onlineStatus,
+			DomainID:     cmp.Or(in.GetDomainId(), session.Domain(0)),
 		})
 	case model.AgentStatusPause:
 		err = api.ctrl.PauseAgent(ctx, session, session.Domain(in.GetDomainId()), in.GetId(), in.GetPayload(), in.GetStatusComment(), 0)