diff --git a/cloud/agent/agent.go b/cloud/agent/agent.go
index e6722d5..a339794 100644
--- a/cloud/agent/agent.go
+++ b/cloud/agent/agent.go
@@ -126,7 +126,9 @@
 		if installationReport != nil {
 			req.InstallationReport = installationReport
 		}
-		res, err := c.Heartbeat(context.Background(), &req)
+		reqCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
+		res, err := c.Heartbeat(reqCtx, &req)
+		cancel()
 		if err != nil {
 			l.Infof("Heartbeat failed: %v", err)
 			time.Sleep(b.NextBackOff())