diff --git a/internal/playback/handler/proxy_request.go b/internal/playback/handler/proxy_request.go
index 73413cac..3a42bc8c 100644
--- a/internal/playback/handler/proxy_request.go
+++ b/internal/playback/handler/proxy_request.go
@@ -13,12 +13,12 @@ import (
 
 func newProxyRequest(ctx context.Context, targetURL string, referer string) (*http.Request, error) {
 	if err := proxytarget.Validate(targetURL); err != nil {
-		return nil, fmt.Errorf("validate proxy target %q: %w", targetURL, err)
+		return nil, fmt.Errorf("validate proxy target: %w", err)
 	}
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, targetURL, nil)
 	if err != nil {
-		return nil, fmt.Errorf("build proxy request for %q: %w", targetURL, err)
+		return nil, fmt.Errorf("build proxy request: %w", err)
 	}
 
 	if referer != "" {
diff --git a/internal/playback/handler/proxy_subtitle.go b/internal/playback/handler/proxy_subtitle.go
index b26dd939..be7f81f5 100644
--- a/internal/playback/handler/proxy_subtitle.go
+++ b/internal/playback/handler/proxy_subtitle.go
@@ -34,8 +34,9 @@ func (h *PlaybackHandler) HandleProxySubtitle(c *gin.Context) {
 	resp, err := h.proxyClient.Do(req)
 	if err != nil {
 		if !errors.Is(err, context.Canceled) {
-			observability.ErrorContext(c.Request.Context(), "proxy_subtitle_upstream_failed", "playback", "", map[string]any{"target_url": targetURL}, err)
-			recordPrivateGinError(c, err)
+			safeErr := errors.New("subtitle upstream request failed")
+			observability.ErrorContext(c.Request.Context(), "proxy_subtitle_upstream_failed", "playback", "", nil, safeErr)
+			recordPrivateGinError(c, safeErr)
 		}
 		c.Status(http.StatusBadGateway)
 		return
@@ -46,8 +47,9 @@ func (h *PlaybackHandler) HandleProxySubtitle(c *gin.Context) {
 
 	body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.MiB2))
 	if err != nil {
-		observability.ErrorContext(c.Request.Context(), "proxy_subtitle_read_failed", "playback", "", map[string]any{"target_url": targetURL}, err)
-		recordPrivateGinError(c, err)
+		safeErr := errors.New("subtitle response read failed")
+		observability.ErrorContext(c.Request.Context(), "proxy_subtitle_read_failed", "playback", "", nil, safeErr)
+		recordPrivateGinError(c, safeErr)
 		c.Status(http.StatusBadGateway)
 		return
 	}
diff --git a/internal/server/observability.go b/internal/server/observability.go
index cf285f4c..ac514505 100644
--- a/internal/server/observability.go
+++ b/internal/server/observability.go
@@ -13,6 +13,9 @@ func RequestLogger() gin.HandlerFunc {
 		start := time.Now()
 		path := c.Request.URL.Path
 		query := c.Request.URL.RawQuery
+		if c.Request.URL.Path == "/watch/proxy/stream" || c.Request.URL.Path == "/watch/proxy/subtitle" {
+			query = ""
+		}
 
 		c.Next()
 
diff --git a/internal/server/server_test.go b/internal/server/server_test.go
index 89b76f80..99f3143a 100644
--- a/internal/server/server_test.go
+++ b/internal/server/server_test.go
@@ -149,7 +149,7 @@ func TestRequestLoggerLogsFailedStreamProxy(t *testing.T) {
 	}
 }
 
-func TestRequestLoggerLogsProxyTokenQuery(t *testing.T) {
+func TestRequestLoggerRedactsProxyTokenQuery(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 
 	var logs bytes.Buffer
@@ -172,8 +172,8 @@ func TestRequestLoggerLogsProxyTokenQuery(t *testing.T) {
 		t.Fatalf("status = %d, want %d", rec.Code, http.StatusForbidden)
 	}
 	got := logs.String()
-	if !strings.Contains(got, `query="lang=en&token=secret-token"`) {
-		t.Fatalf("log line missing raw query: %s", got)
+	if strings.Contains(got, "secret-token") || strings.Contains(got, "query=") {
+		t.Fatalf("log leaked proxy query: %s", got)
 	}
 }