diff --git a/lib/api/middlewares/client-header.js b/lib/api/middlewares/client-header.js
index dfcf488a..de750aed 100644
--- a/lib/api/middlewares/client-header.js
+++ b/lib/api/middlewares/client-header.js
@@ -4,7 +4,9 @@ module.exports = function clientHeader () {
     return function clientHeaderMiddleware (req, res, next) {
         const { client } = req.query;
 
-        res.set('Carto-Client', client);
+        if (client) {
+            res.set('Carto-Client', client);
+        }
 
         return next();
     };