diff --git a/client/internal/engine.go b/client/internal/engine.go
index 5c5fb0acb..3d43023d6 100644
--- a/client/internal/engine.go
+++ b/client/internal/engine.go
@@ -898,7 +898,6 @@ func (e *Engine) receiveJobEvents() {
 				bundleResult, err := e.handleBundle(params.Bundle)
 				if err != nil {
 					resp.Reason = []byte(err.Error())
-					resp.Status = mgmProto.JobStatus_failed
 					return &resp
 				}
 				resp.Status = mgmProto.JobStatus_succeeded
diff --git a/management/server/types/job.go b/management/server/types/job.go
index 74abba9be..d2973233c 100644
--- a/management/server/types/job.go
+++ b/management/server/types/job.go
@@ -160,6 +160,8 @@ func (j *Job) ApplyResponse(resp *proto.JobResponse) error {
 	if resp == nil {
 		return nil
 	}
+
+	j.ID = string(resp.ID)
 	now := time.Now().UTC()
 	j.CompletedAt = &now
 	switch resp.Status {
diff --git a/shared/management/client/grpc.go b/shared/management/client/grpc.go
index 1739f8e6b..f5759ef21 100644
--- a/shared/management/client/grpc.go
+++ b/shared/management/client/grpc.go
@@ -180,13 +180,19 @@ func (c *GrpcClient) handleJobStream(
 	// Main loop: receive, process, respond
 	for {
 		jobReq, err := c.receiveJobRequest(ctx, stream, serverPubKey)
-		if err != nil {
-			if errors.Is(err, io.EOF) || errors.Is(err, context.Canceled) {
-				log.WithContext(ctx).Info("job stream closed by server")
+		if err != nil && err != io.EOF {
+			c.notifyDisconnected(err)
+			s, _ := gstatus.FromError(err)
+			switch s.Code() {
+			case codes.PermissionDenied:
+				return backoff.Permanent(err) // unrecoverable error, propagate to the upper layer
+			case codes.Canceled:
+				log.Debugf("management connection context has been canceled, this usually indicates shutdown")
 				return nil
+			default:
+				log.Warnf("disconnected from the Management service but will retry silently. Reason: %v", err)
+				return err
 			}
-			log.WithContext(ctx).Errorf("error receiving job request: %v", err)
-			return err
 		}
 
 		if jobReq == nil || len(jobReq.ID) == 0 {
@@ -298,7 +304,7 @@ func (c *GrpcClient) handleSyncStream(ctx context.Context, serverPubKey wgtypes.
 
 	// blocking until error
 	err = c.receiveUpdatesEvents(stream, serverPubKey, msgHandler)
-	if err != nil && err != io.EOF{
+	if err != nil && err != io.EOF {
 		c.notifyDisconnected(err)
 		s, _ := gstatus.FromError(err)
 		switch s.Code() {