diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/AdvancedMultiSelect.js b/monkey/monkey_island/cc/ui/src/components/ui-components/AdvancedMultiSelect.js
index 8503a74fc..a8878c986 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/AdvancedMultiSelect.js
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/AdvancedMultiSelect.js
@@ -94,9 +94,11 @@ class AdvancedMultiSelect extends React.Component {
   }
 
   setMasterCheckboxState(selectValues) {
-    this.setState(() => ({
-      masterCheckboxState: this.getMasterCheckboxState(selectValues)
-    }));
+    let newState = this.getMasterCheckboxState(selectValues);
+
+    if (newState != this.state.masterCheckboxState) {
+      this.setState({masterCheckboxState: newState});
+    }
   }
 
   getMasterCheckboxState(selectValues) {
@@ -188,6 +190,10 @@ class AdvancedMultiSelect extends React.Component {
       </div>
     );
   }
+
+  componentDidUpdate(_prevProps) {
+    this.setMasterCheckboxState(this.props.value);
+  }
 }
 
 export default AdvancedMultiSelect;