diff --git a/lib/cartodb/models/analysis_mapconfig_adapter.js b/lib/cartodb/models/analysis_mapconfig_adapter.js
index 77556e25..c0cb6b8f 100644
--- a/lib/cartodb/models/analysis_mapconfig_adapter.js
+++ b/lib/cartodb/models/analysis_mapconfig_adapter.js
@@ -108,12 +108,12 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r
     if (Array.isArray(requestMapConfig.analyses)) {
         requestMapConfig = replaceSourceRootQueries(requestMapConfig, analysisToRemove);
         requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
-    }
 
-    if (Object.keys(dataviews).length === 0) {
-        requestMapConfig.analyses = requestMapConfig.analyses.filter(function(analysis, index) {
-            return !analysisToRemove.hasOwnProperty(index);
-        });
+        if (Object.keys(dataviews).length === 0) {
+            requestMapConfig.analyses = requestMapConfig.analyses.filter(function(analysis, index) {
+                return !analysisToRemove.hasOwnProperty(index);
+            });
+        }
     }
 
     if (!shouldAdaptLayers(requestMapConfig)) {