diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/ExceptFavoriteCleanupAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/ExceptFavoriteCleanupAlgorithm.java
index d2920db9c..f0788db33 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/ExceptFavoriteCleanupAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/ExceptFavoriteCleanupAlgorithm.java
@@ -13,6 +13,7 @@ import java.util.Locale;
 import java.util.concurrent.ExecutionException;
 
 import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * A cleanup algorithm that removes any item that isn't a favorite but only if space is needed.
@@ -86,6 +87,13 @@ public class ExceptFavoriteCleanupAlgorithm extends EpisodeCleanupAlgorithm {
 
     @Override
     public int getDefaultCleanupParameter() {
+        int cacheSize = UserPreferences.getEpisodeCacheSize();
+        if (cacheSize != UserPreferences.getEpisodeCacheSizeUnlimited()) {
+            int downloadedEpisodes = DBReader.getNumberOfDownloadedEpisodes();
+            if (downloadedEpisodes > cacheSize) {
+                return downloadedEpisodes - cacheSize;
+            }
+        }
         return 0;
     }
 }