diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
index 7ba3c1f1..9a5a1417 100644
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
@@ -66,15 +66,17 @@ function augmentLayer(overviewsMetadataBackend, filterStatsBackend, user, layer,
             return callback(err, layer);
         }
 
+        if (_.isEmpty(metadata)) {
+            return callback(null, layer);
+        }
+
         queryRewriteData.overviews = metadata;
 
         var filters = queryRewriteData.filters;
 
         if (!filters) {
-            if (!_.isEmpty(metadata)) {
-                layer = Object.assign({}, layer);
-                layer.options = Object.assign({}, layer.options, { query_rewrite_data: queryRewriteData });
-            }
+            layer = Object.assign({}, layer);
+            layer.options = Object.assign({}, layer.options, { query_rewrite_data: queryRewriteData });
 
             return callback(null, layer);
         }
@@ -88,10 +90,8 @@ function augmentLayer(overviewsMetadataBackend, filterStatsBackend, user, layer,
 
             queryRewriteData.filter_stats = stats;
 
-            if (!_.isEmpty(metadata)) {
-                layer = Object.assign({}, layer);
-                layer.options = Object.assign({}, layer.options, { query_rewrite_data: queryRewriteData });
-            }
+            layer = Object.assign({}, layer);
+            layer.options = Object.assign({}, layer.options, { query_rewrite_data: queryRewriteData });
 
             return callback(null, layer);
         });