diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
index 3ffbdf7b95794..81e7bdfb48575 100644
--- a/src/ui/public/visualize/visualize.js
+++ b/src/ui/public/visualize/visualize.js
@@ -142,6 +142,16 @@ uiModules
         applyClassNames();
       });
 
+      function updateVisAggs() {
+        const enabledState = $scope.editableVis.getEnabledState();
+        const shouldUpdate = enabledState.aggs.length !== $scope.vis.aggs.length;
+
+        if (shouldUpdate) {
+          $scope.vis.setState(enabledState);
+          $scope.editableVis.dirty = false;
+        }
+      }
+
       $scope.$watch('vis', prereq(function (vis, oldVis) {
         const $visEl = getVisEl();
         if (!$visEl) return;
@@ -157,6 +167,7 @@ uiModules
       }));
 
       $scope.$watchCollection('vis.params', prereq(function () {
+        updateVisAggs();
         if ($scope.renderbot) $scope.renderbot.updateParams();
       }));