diff --git a/src/frontend/middleware.go b/src/frontend/middleware.go
index 7ed0cee..a53c0b0 100644
--- a/src/frontend/middleware.go
+++ b/src/frontend/middleware.go
@@ -110,8 +110,10 @@ func ensureApigeeClientID(next http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var apigeeClientID string
 		apigeeClientID = currentApigeeClientID(r)
-		ctx := metadata.AppendToOutgoingContext(r.Context(), apigeeClientIDHeaderName, apigeeClientID)
-		r = r.WithContext(ctx)
+		if apigeeClientID != "" {
+			ctx := metadata.AppendToOutgoingContext(r.Context(), apigeeClientIDHeaderName, apigeeClientID)
+			r = r.WithContext(ctx)
+		}
 		next.ServeHTTP(w, r)
 	}
 }