diff --git a/docs/querying/api.md b/docs/querying/api.md
index 0343ebdc12..bb68418117 100644
--- a/docs/querying/api.md
+++ b/docs/querying/api.md
@@ -86,7 +86,7 @@ URL query parameters:
 - `time=<rfc3339 | unix_timestamp>`: Evaluation timestamp. Optional.
 - `timeout=<duration>`: Evaluation timeout. Optional. Defaults to and
    is capped by the value of the `-query.timeout` flag.
-- `limit=<number>`: Maximum number of returned series. doesn’t affect scalars or strings but truncates series for matrices and vectors. Optional.
+- `limit=<number>`: Maximum number of returned series. Doesn’t affect scalars or strings but truncates the number of series for matrices and vectors. Optional. 0 means disabled.
 
 The current server time is used if the `time` parameter is omitted.
 
@@ -155,7 +155,7 @@ URL query parameters:
 - `step=<duration | float>`: Query resolution step width in `duration` format or float number of seconds.
 - `timeout=<duration>`: Evaluation timeout. Optional. Defaults to and
    is capped by the value of the `-query.timeout` flag.
-- `limit=<number>`: Maximum number of returned series. Optional.
+- `limit=<number>`: Maximum number of returned series. Optional. 0 means disabled.
 
 You can URL-encode these parameters directly in the request body by using the `POST` method and
 `Content-Type: application/x-www-form-urlencoded` header. This is useful when specifying a large
diff --git a/web/api/v1/api.go b/web/api/v1/api.go
index 0c624cd030..cdd6af963e 100644
--- a/web/api/v1/api.go
+++ b/web/api/v1/api.go
@@ -480,7 +480,7 @@ func (api *API) query(r *http.Request) (result apiFuncResult) {
 		return apiFuncResult{nil, returnAPIError(res.Err), res.Warnings, qry.Close}
 	}
 
-	var warnings annotations.Annotations
+	warnings := res.Warnings
 	if limit > 0 {
 		res = truncateResults(res, limit)
 		warnings = warnings.Add(errors.New("results truncated due to limit"))