diff --git a/service/podcastService.go b/service/podcastService.go
index 9f03a77..8407d89 100644
--- a/service/podcastService.go
+++ b/service/podcastService.go
@@ -178,8 +178,12 @@ func AddPodcastItems(podcast *db.Podcast) error {
 			}
 
 			var downloadStatus db.DownloadStatus
-			if i < limit {
-				downloadStatus = db.NotDownloaded
+			if setting.AutoDownload {
+				if i < limit {
+					downloadStatus = db.NotDownloaded
+				} else {
+					downloadStatus = db.Deleted
+				}
 			} else {
 				downloadStatus = db.Deleted
 			}