diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index fcab402390..9cbcfe76d7 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -285,6 +285,12 @@ 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);
diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
index 4556f866d9..e500d0af64 100644
--- a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
+++ b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
@@ -137,7 +137,7 @@ export default function Bucket({
             title={BUCKET_DATA[bucket].name}
           />
           <h1 styleName="no-results">
-            {(filterState.recommended && activeBucket === 'openForRegistration') ? null : `${NO_LIVE_CHALLENGES_CONFIG[activeBucket]}`}
+            {`${NO_LIVE_CHALLENGES_CONFIG[activeBucket]}`}
           </h1>
         </div>
       </div>
diff --git a/src/shared/utils/challenge-listing/buckets.js b/src/shared/utils/challenge-listing/buckets.js
index ae624ed2d3..b498a8451e 100644
--- a/src/shared/utils/challenge-listing/buckets.js
+++ b/src/shared/utils/challenge-listing/buckets.js
@@ -217,8 +217,13 @@ export function isFilterEmpty(filter, tab, bucket) {
   let f;
   let empty;
 
+  if (!filter.tco) {
+    // eslint-disable-next-line no-param-reassign
+    delete filter.tco;
+  }
+
   if (tab === 'past') {
-    f = _.pick(filter, 'tracks', 'search', 'types', 'startDateEnd', 'endDateStart');
+    f = _.pick(filter, 'tracks', 'search', 'types', 'startDateEnd', 'endDateStart', 'tco');
     if (f.types) f.types = [...f.types].sort();
     empty = {
       tracks: {
@@ -245,7 +250,7 @@ export function isFilterEmpty(filter, tab, bucket) {
       reviewOpportunityTypes: _.keys(REVIEW_OPPORTUNITY_TYPES),
     };
   } else {
-    f = _.pick(filter, 'tracks', 'search', 'types');
+    f = _.pick(filter, 'tracks', 'search', 'types', 'tco');
     if (f.types) f.types = [...f.types].sort();
     empty = {
       tracks: {