diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc639987..d129ff33 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,6 @@ jobs:
   ci:
     uses: shlinkio/github-actions/.github/workflows/web-app-ci.yml@main
     with:
-      node-version: 16.14
+      node-version: 16.15
       with-mutation-tests: true
       publish-coverage: true
diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml
index 7761747d..b958cc37 100644
--- a/.github/workflows/deploy-preview.yml
+++ b/.github/workflows/deploy-preview.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Use node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16.14
+          node-version: 16.15
       - name: Build
         run: |
           npm ci && \
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 18ff70d8..1ab257a4 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Use node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16.14
+          node-version: 16.15
       - name: Generate release assets
         run: npm ci && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist
       - name: Publish release with assets
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6809351..25c52727 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
 
-## [Unreleased]
+## [3.7.1] - 2022-05-25
 ### Added
 * *Nothing*
 
@@ -18,7 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * *Nothing*
 
 ### Fixed
-* *Nothing*
+* [#653](https://github.com/shlinkio/shlink-web-client/pull/653) Fixed rendering values greater than 1000 in charts, when the browser has certain locales configured.
 
 
 ## [3.7.0] - 2022-05-14
diff --git a/Dockerfile b/Dockerfile
index b9bb22ba..d907daa8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.14-alpine as node
+FROM node:16.15-alpine as node
 COPY . /shlink-web-client
 ARG VERSION="latest"
 ENV VERSION ${VERSION}
diff --git a/docker-compose.yml b/docker-compose.yml
index 4fdce7d6..3c8589a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   shlink_web_client_node:
     container_name: shlink_web_client_node
-    image: node:16.14-alpine
+    image: node:16.15-alpine
     command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
     volumes:
       - ./:/home/shlink/www
diff --git a/src/utils/helpers/charts.ts b/src/utils/helpers/charts.ts
index 5a849064..7914eee8 100644
--- a/src/utils/helpers/charts.ts
+++ b/src/utils/helpers/charts.ts
@@ -11,8 +11,6 @@ export const pointerOnHover = ({ native }: ChartEvent, [firstElement]: ActiveEle
   canvas.style.cursor = firstElement ? 'pointer' : 'default';
 };
 
-export const renderChartLabel = ({ dataset, formattedValue }: TooltipItem<ChartType>) =>
-  `${dataset.label}: ${prettify(formattedValue)}`;
+export const renderChartLabel = ({ dataset, raw }: TooltipItem<ChartType>) => `${dataset.label}: ${prettify(`${raw}`)}`;
 
-export const renderPieChartLabel = ({ label, formattedValue }: TooltipItem<ChartType>) =>
-  `${label}: ${prettify(formattedValue)}`;
+export const renderPieChartLabel = ({ label, raw }: TooltipItem<ChartType>) => `${label}: ${prettify(`${raw}`)}`;
diff --git a/src/visits/VisitsStats.tsx b/src/visits/VisitsStats.tsx
index f0e35b89..59885d5f 100644
--- a/src/visits/VisitsStats.tsx
+++ b/src/visits/VisitsStats.tsx
@@ -300,19 +300,19 @@ const VisitsStats: FC<VisitsStatsProps> = ({
           {visits.length > 0 && (
             <div className="col-lg-5 col-xl-6 mt-3 mt-lg-0">
               <div className="d-flex">
-                <Button
-                  outline
-                  disabled={highlightedVisits.length === 0}
-                  className="btn-md-block me-2"
-                  onClick={() => setSelectedVisits([])}
-                >
-                  Clear selection {highlightedVisits.length > 0 && <>({prettify(highlightedVisits.length)})</>}
-                </Button>
                 <ExportBtn
                   className="btn-md-block"
                   amount={normalizedVisits.length}
                   onClick={() => exportCsv(normalizedVisits)}
                 />
+                <Button
+                  outline
+                  disabled={highlightedVisits.length === 0}
+                  className="btn-md-block ms-2"
+                  onClick={() => setSelectedVisits([])}
+                >
+                  Clear selection {highlightedVisits.length > 0 && <>({prettify(highlightedVisits.length)})</>}
+                </Button>
               </div>
             </div>
           )}