diff --git a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index a420f9d26..0c42bdd65 100644
--- a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -261,6 +261,7 @@ public class NewEpisodesFragment extends Fragment {
         listAdapter.notifyDataSetChanged();
         getActivity().supportInvalidateOptionsMenu();
         updateProgressBarVisibility();
+        updateShowOnlyEpisodesListViewState();
     }
 
     private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
@@ -368,6 +369,16 @@ public class NewEpisodesFragment extends Fragment {
         if (itemsLoaded && viewsCreated) {
             listAdapter.notifyDataSetChanged();
             activity.get().supportInvalidateOptionsMenu();
+            updateShowOnlyEpisodesListViewState();
+        }
+    }
+
+    private void updateShowOnlyEpisodesListViewState() {
+        if (showOnlyNewEpisodes) {
+            listView.setEmptyView(null);
+            txtvEmpty.setVisibility(View.GONE);
+        } else {
+            listView.setEmptyView(txtvEmpty);
         }
     }