diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index 9cbcfe76d7..69b8e823f8 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -257,7 +257,7 @@ export default function FiltersPanel({
   const disableClearFilterButtons = isFilterEmpty(filterState, past ? 'past' : '', activeBucket);
 
   const isRecommendedChallengesVisible = (activeBucket === 'openForRegistration' && config.ENABLE_RECOMMENDER);
-  const isTcoChallengesVisible = (activeBucket === 'openForRegistration' || activeBucket === 'all' || activeBucket === 'allPast' || activeBucket === 'myPast');
+  const isTcoChallengesVisible = activeBucket !== BUCKETS.REVIEW_OPPORTUNITIES;
   const [recommendedToggle, setRecommendedToggle] = useState(false);
   const [tcoToggle, setTcoToggle] = useState(false);
 
@@ -285,12 +285,6 @@ export default function FiltersPanel({
     setTcoToggle(on);
   };
 
-  useEffect(() => {
-    if (activeBucket === BUCKETS.MY && tcoToggle) {
-      onSwitchTcoChallenge(false);
-    }
-  }, [activeBucket, tcoToggle]);
-
   const onSwitchRecommendedChallenge = (on) => {
     setFilterState({ ..._.clone(filterState), recommended: on });
     selectBucket(BUCKETS.OPEN_FOR_REGISTRATION);