diff --git a/packages/asc-web-common/components/FilterInput/FilterInput.js b/packages/asc-web-common/components/FilterInput/FilterInput.js
index b83f099e35..9b84d112df 100644
--- a/packages/asc-web-common/components/FilterInput/FilterInput.js
+++ b/packages/asc-web-common/components/FilterInput/FilterInput.js
@@ -230,8 +230,10 @@ class FilterInput extends React.Component {
   }
 
   checkingOrderItems = () => {
-    const itemsState = this.props.selectedFilterData.filterValues;
     const filterValues = this.getDefaultFilterData();
+    const itemsState = this.state.filterValues.length
+      ? this.state.filterValues
+      : filterValues;
     let updatedValues = itemsState.slice();
 
     if (itemsState.length === filterValues.length) {
@@ -263,7 +265,7 @@ class FilterInput extends React.Component {
       });
     }
 
-    this.setState({ filterValues });
+    this.setState({ filterValues: updatedValues });
     this.updateFilter(updatedValues);
   };