diff --git a/src/components/filter/FilterEditor.jsx b/src/components/filter/FilterEditor.jsx
index 333e3e8b..a458cf25 100644
--- a/src/components/filter/FilterEditor.jsx
+++ b/src/components/filter/FilterEditor.jsx
@@ -84,6 +84,10 @@ export default class CombiningFilterEditor extends React.Component {
     onChange: PropTypes.func.isRequired,
   }
 
+  static defaultProps = {
+    filter: ["all"],
+  }
+
   constructor (props) {
     super();
     this.state = {
@@ -256,13 +260,6 @@ export default class CombiningFilterEditor extends React.Component {
     else {
       let {filter} = this.props;
 
-      if (!filter) {
-        filter = defaultFilter;
-      }
-      else if (isNestedCombiningFilter) {
-        filter = migrateFilter(filter);
-      }
-
       const errorMessage = Object.entries(errors)
         .filter(([k, v]) => k.match(/filter(\[\d+\])?/))
         .map(([k, v]) => {