diff --git a/src/shared/containers/challenge-listing/FilterPanel.jsx b/src/shared/containers/challenge-listing/FilterPanel.jsx
index 045710dd89..43ce2ff7da 100644
--- a/src/shared/containers/challenge-listing/FilterPanel.jsx
+++ b/src/shared/containers/challenge-listing/FilterPanel.jsx
@@ -99,7 +99,7 @@ export class Container extends React.Component {
       validTypes,
     } = this.props;
 
-    if (validTypes.length && !this.initialDefaultChallengeTypes) {
+    if (!filterState.types.length && validTypes.length && !this.initialDefaultChallengeTypes) {
       setFilterState({
         ..._.clone(filterState),
         types: validTypes.map(item => item.abbreviation),