diff --git a/internal/taskAgent/service.go b/internal/taskAgent/service.go
index fa6ba7f..c430492 100644
--- a/internal/taskAgent/service.go
+++ b/internal/taskAgent/service.go
@@ -32,8 +32,8 @@ func (s *service) FetchTasks(ctx context.Context) (received []structs.Task, err
 		return nil, err
 	}
 
+	log.Infof("%v Receiving tasks", pkgLogHeader)
 	for {
-		log.Infof("%v Receiving tasks", pkgLogHeader)
 		task, err := stream.Recv()
 		if err == io.EOF {
 			break
@@ -47,8 +47,8 @@ func (s *service) FetchTasks(ctx context.Context) (received []structs.Task, err
 			MerchUuid: task.MerchUuid,
 			Origins:   task.Origins,
 		})
-		log.WithField("Count", len(received)).Infof("%v End receiving tasks", pkgLogHeader)
 	}
+	log.WithField("Count", len(received)).Infof("%v End receiving tasks", pkgLogHeader)
 
 	return received, nil
 }
@@ -81,5 +81,11 @@ func (s *service) SendResults(ctx context.Context, results []structs.Result) err
 		return err
 	}
 
+	if _, err = stream.CloseAndRecv(); err != nil {
+		log.WithError(err).Errorf("%v Failed to receive server response", pkgLogHeader)
+		return err
+	}
+
+	log.Debugf("%v End send results", pkgLogHeader)
 	return nil
 }