diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/cartodb/api/map/preview-layergroup-controller.js
index 29db8729..5e9144c3 100644
--- a/lib/cartodb/api/map/preview-layergroup-controller.js
+++ b/lib/cartodb/api/map/preview-layergroup-controller.js
@@ -11,6 +11,7 @@ const cacheControlHeader = require('../middlewares/cache-control-header');
 const cacheChannelHeader = require('../middlewares/cache-channel-header');
 const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
 const lastModifiedHeader = require('../middlewares/last-modified-header');
+const checkStaticImageFormat = require('../middlewares/check-static-image-format');
 
 module.exports = class PreviewLayergroupController {
     constructor (
@@ -43,6 +44,7 @@ module.exports = class PreviewLayergroupController {
             dbConnSetup(this.pgConnection),
             rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
             cleanUpQueryParams(['layer']),
+            checkStaticImageFormat(),
             createMapStoreMapConfigProvider(
                 this.mapStore,
                 this.userLimitsBackend,
diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/cartodb/api/map/preview-template-controller.js
index 9f5257a3..b0359e69 100644
--- a/lib/cartodb/api/map/preview-template-controller.js
+++ b/lib/cartodb/api/map/preview-template-controller.js
@@ -7,6 +7,7 @@ const cacheControlHeader = require('../middlewares/cache-control-header');
 const cacheChannelHeader = require('../middlewares/cache-channel-header');
 const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
 const lastModifiedHeader = require('../middlewares/last-modified-header');
+const checkStaticImageFormat = require('../middlewares/check-static-image-format');
 const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 
@@ -52,6 +53,7 @@ PreviewTemplateController.prototype.register = function (mapRouter) {
         dbConnSetup(this.pgConnection),
         rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
         cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
+        checkStaticImageFormat(),
         namedMapProvider({
             namedMapProviderCache: this.namedMapProviderCache,
             label: 'STATIC_VIZ_MAP', forcedFormat: 'png'
@@ -253,7 +255,7 @@ function getImage({ previewBackend, label }) {
         height = +height;
 
         const format = req.params.format === 'jpg' ? 'jpeg' : 'png';
-
+        
         if (zoom !== undefined && center) {
             return previewBackend.getImage(mapConfigProvider, format, width, height, zoom, center,
                 (err, image, headers, stats) => {