diff --git a/pkg/proto/v0/settings.pb.web.go b/pkg/proto/v0/settings.pb.web.go
index 2bb3e6359..2556a1cf2 100644
--- a/pkg/proto/v0/settings.pb.web.go
+++ b/pkg/proto/v0/settings.pb.web.go
@@ -5,7 +5,6 @@ package proto
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"net/http"
 
@@ -35,7 +34,7 @@ func (h *webBundleServiceHandler) SaveSettingsBundle(w http.ResponseWriter, r *h
 	}
 
 	if err := h.h.SaveSettingsBundle(
-		context.Background(),
+		r.Context(),
 		req,
 		resp,
 	); err != nil {
@@ -59,7 +58,7 @@ func (h *webBundleServiceHandler) GetSettingsBundle(w http.ResponseWriter, r *ht
 	}
 
 	if err := h.h.GetSettingsBundle(
-		context.Background(),
+		r.Context(),
 		req,
 		resp,
 	); err != nil {
@@ -83,7 +82,7 @@ func (h *webBundleServiceHandler) ListSettingsBundles(w http.ResponseWriter, r *
 	}
 
 	if err := h.h.ListSettingsBundles(
-		context.Background(),
+		r.Context(),
 		req,
 		resp,
 	); err != nil {
@@ -127,7 +126,7 @@ func (h *webValueServiceHandler) SaveSettingsValue(w http.ResponseWriter, r *htt
 	}
 
 	if err := h.h.SaveSettingsValue(
-		context.Background(),
+		r.Context(),
 		req,
 		resp,
 	); err != nil {
@@ -151,7 +150,7 @@ func (h *webValueServiceHandler) GetSettingsValue(w http.ResponseWriter, r *http
 	}
 
 	if err := h.h.GetSettingsValue(
-		context.Background(),
+		r.Context(),
 		req,
 		resp,
 	); err != nil {
@@ -175,7 +174,7 @@ func (h *webValueServiceHandler) ListSettingsValues(w http.ResponseWriter, r *ht
 	}
 
 	if err := h.h.ListSettingsValues(
-		context.Background(),
+		r.Context(),
 		req,
 		resp,
 	); err != nil {