diff --git a/lib/cartodb/models/analysis-mapconfig-adapter.js b/lib/cartodb/models/analysis-mapconfig-adapter.js
index 7f45fd89..3c5761c6 100644
--- a/lib/cartodb/models/analysis-mapconfig-adapter.js
+++ b/lib/cartodb/models/analysis-mapconfig-adapter.js
@@ -70,6 +70,11 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r
     // jshint maxcomplexity:7
     var self = this;
     filters = filters || {};
+
+    if (!shouldAdaptLayers(requestMapConfig)) {
+        return callback(null, requestMapConfig);
+    }
+
     var dataviewsFilters = filters.dataviews || {};
     debug(dataviewsFilters);
     var dataviews = requestMapConfig.dataviews || {};
@@ -93,10 +98,6 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r
 
     requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
 
-    if (!shouldAdaptLayers(requestMapConfig)) {
-        return callback(null, requestMapConfig);
-    }
-
     function createAnalysis(analysisDefinition, done) {
         self.analysisBackend.create(analysisConfiguration, analysisDefinition, done);
     }