diff --git a/internal/app/app.go b/internal/app/app.go
index c7359e1..4f27a7d 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -141,7 +141,7 @@ func (app *App) Run(ctx context.Context) {
 				l := len(sendData)
 				if l > 0 {
 					log.WithField("length", l).Debug("Sending parsed data")
-					app.network.SendResult(apiClient, sendData)
+					app.network.SendResult(ctx, apiClient, sendData)
 					sendData = sendData[:0]
 				}
 			}
diff --git a/internal/remote/interface.go b/internal/remote/interface.go
index b34de33..210d214 100644
--- a/internal/remote/interface.go
+++ b/internal/remote/interface.go
@@ -8,5 +8,5 @@ import (
 
 type Handler interface {
 	RequestTasks(ctx context.Context, client pb.TaskProcessorClient) []shared.TaskResponse
-	SendResult(client pb.TaskProcessorClient, tasksDone []shared.TaskResult)
+	SendResult(ctx context.Context, client pb.TaskProcessorClient, tasksDone []shared.TaskResult)
 }
diff --git a/internal/remote/send.go b/internal/remote/send.go
index 6e9c148..046fadf 100644
--- a/internal/remote/send.go
+++ b/internal/remote/send.go
@@ -5,10 +5,14 @@ import (
 	log "github.com/sirupsen/logrus"
 	"task-processor/internal/shared"
 	pb "task-processor/proto/taskProcessor"
+	"time"
 )
 
-func (n *Network) SendResult(client pb.TaskProcessorClient, tasksDone []shared.TaskResult) {
-	stream, err := client.SendResult(context.Background())
+func (n *Network) SendResult(ctx context.Context, client pb.TaskProcessorClient, tasksDone []shared.TaskResult) {
+	sendCtx, cancel := context.WithTimeout(ctx, time.Second*60)
+	defer cancel()
+
+	stream, err := client.SendResult(sendCtx)
 	if err != nil {
 		log.Fatalf("Error calling PostMerch: %v", err)
 	}
@@ -29,7 +33,12 @@ func (n *Network) SendResult(client pb.TaskProcessorClient, tasksDone []shared.T
 		}
 	}
 
-	if err = stream.CloseSend(); err != nil {
-		log.Fatalf("Error closing stream: %v", err)
+	//if err = stream.CloseSend(); err != nil {
+	//	log.Fatalf("Error closing stream: %v", err)
+	//}
+
+	_, err = stream.CloseAndRecv()
+	if err != nil {
+		log.Fatalf("Error receiving response: %v", err)
 	}
 }