diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
index dd07ccd9..06b67b64 100644
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
@@ -54,25 +54,26 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function (user, requestMapCon
                         filters,
                         function (err, stats) {
                             if (err) {
-                                // next with error
+                                return done(null, layer);
                             }
 
                             query_rewrite_data.filter_stats = stats;
 
-                            // next
+                            if (!_.isEmpty(metadata)) {
+                                layer = _.extend({}, layer);
+                                layer.options = _.extend({}, layer.options, { query_rewrite_data: query_rewrite_data });
+                            }
+
+                            return done(null, layer);
                         }
                     );
                 } else {
-                    // next
-                }
-
-
-                function addDataToLayer(err) {
-                    if (!err && !_.isEmpty(metadata)) {
+                    if (!_.isEmpty(metadata)) {
                         layer = _.extend({}, layer);
                         layer.options = _.extend({}, layer.options, { query_rewrite_data: query_rewrite_data });
                     }
-                    done(null, layer);
+
+                    return done(null, layer);
                 }
             }
         });