diff --git a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
index fc77af555..c9c369dc6 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -92,7 +92,7 @@ public class TagViewFragment extends TaskListFragment {
                 } else if (AstridApiConstants.BROADCAST_EVENT_TAG_DELETED.equals(action)) {
                     String activeUuid = tagData.getUuid();
                     if (activeUuid.equals(uuid)) {
-                        activity.onFilterItemClicked(BuiltInFilterExposer.getMyTasksFilter(getResources()));
+                        activity.onFilterItemClicked(null);
                         activity.clearNavigationDrawer(); // Should auto refresh
                     }
                 }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 1ed5aece3..0d7c0893a 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -228,6 +228,9 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
 
     @Override
     public void onFilterItemClicked(FilterListItem item) {
+        if (item == null) {
+            item = defaultFilterProvider.getDefaultFilter();
+        }
         TaskEditFragment tef = getTaskEditFragment();
         if (tef != null) {
             getTaskEditFragment().save();
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index c44fcc1f1..56943395b 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -735,7 +735,7 @@ public class TaskListFragment extends InjectingListFragment implements
                     CustomFilter customFilter = data.getParcelableExtra(FilterSettingsActivity.TOKEN_FILTER);
                     ((TaskListActivity) getActivity()).onFilterItemClicked(customFilter);
                 } else if(AstridApiConstants.BROADCAST_EVENT_FILTER_DELETED.equals(action)) {
-                    ((TaskListActivity) getActivity()).onFilterItemClicked(BuiltInFilterExposer.getMyTasksFilter(getResources()));
+                    ((TaskListActivity) getActivity()).onFilterItemClicked(null);
                 }
 
                 ((TaskListActivity) getActivity()).refreshNavigationDrawer();