diff --git a/client/components/modals/item/tabs/Episodes.vue b/client/components/modals/item/tabs/Episodes.vue
index 7352c072..37a0a8aa 100644
--- a/client/components/modals/item/tabs/Episodes.vue
+++ b/client/components/modals/item/tabs/Episodes.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="w-full h-full overflow-y-auto overflow-x-hidden px-4 py-6">
     <div class="w-full mb-4">
+      <div class="flex items-center mb-4">
+        <p v-if="autoDownloadEpisodes">Last new episode check {{ $formatDate(lastEpisodeCheck) }}</p>
+        <div class="flex-grow" />
+        <ui-btn :loading="checkingNewEpisodes" @click="checkForNewEpisodes">Check for new episodes</ui-btn>
+      </div>
+
       <div class="w-full p-4 bg-primary">
         <p>Podcast Episodes</p>
       </div>
@@ -40,16 +46,48 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      checkingNewEpisodes: false
+    }
   },
   computed: {
+    autoDownloadEpisodes() {
+      return !!this.media.autoDownloadEpisodes
+    },
+    lastEpisodeCheck() {
+      return this.media.lastEpisodeCheck
+    },
     media() {
       return this.libraryItem ? this.libraryItem.media || {} : {}
     },
+    libraryItemId() {
+      return this.libraryItem ? this.libraryItem.id : null
+    },
     episodes() {
       return this.media.episodes || []
     }
   },
-  methods: {}
+  methods: {
+    checkForNewEpisodes() {
+      this.checkingNewEpisodes = true
+      this.$axios
+        .$get(`/api/podcasts/${this.libraryItemId}/checknew`)
+        .then((response) => {
+          if (response.episodes && response.episodes.length) {
+            console.log('New episodes', response.episodes.length)
+            this.$toast.success(`${response.episodes.length} new episodes found!`)
+          } else {
+            this.$toast.info('No new episodes found')
+          }
+          this.checkingNewEpisodes = false
+        })
+        .catch((error) => {
+          console.error('Failed', error)
+          var errorMsg = error.response && error.response.data ? error.response.data : 'Unknown Error'
+          this.$toast.error(errorMsg)
+          this.checkingNewEpisodes = false
+        })
+    }
+  }
 }
 </script>
\ No newline at end of file
diff --git a/client/components/modals/podcast/NewModal.vue b/client/components/modals/podcast/NewModal.vue
index 75ebf0e7..2ad85fcf 100644
--- a/client/components/modals/podcast/NewModal.vue
+++ b/client/components/modals/podcast/NewModal.vue
@@ -250,6 +250,9 @@ export default {
         this.folderUpdated()
       }
     }
+  },
+  mounted() {
+    console.log('Podcast feed data', this.podcastFeedData)
   }
 }
 </script>
diff --git a/server/Db.js b/server/Db.js
index b13ad056..46e06017 100644
--- a/server/Db.js
+++ b/server/Db.js
@@ -183,6 +183,10 @@ class Db {
     }
   }
 
+  getLibraryItem(id) {
+    return this.libraryItems.find(li => li.id === id)
+  }
+
   async updateLibraryItem(libraryItem) {
     return this.updateLibraryItems([libraryItem])
   }
diff --git a/server/Server.js b/server/Server.js
index 736489fb..98d4c154 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -130,6 +130,7 @@ class Server {
 
     await this.backupManager.init()
     await this.logManager.init()
+    this.podcastManager.init()
 
     if (this.db.serverSettings.scannerDisableWatcher) {
       Logger.info(`[Server] Watcher is disabled`)
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 10c4e5e6..8b11f711 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -37,6 +37,12 @@ class LibraryItemController {
 
     var hasUpdates = libraryItem.update(req.body)
     if (hasUpdates) {
+
+      // Turn on podcast auto download cron if not already on
+      if (libraryItem.mediaType == 'podcast' && req.body.media.autoDownloadEpisodes && !this.podcastManager.episodeScheduleTask) {
+        this.podcastManager.schedulePodcastEpisodeCron()
+      }
+
       Logger.debug(`[LibraryItemController] Updated now saving`)
       await this.db.updateLibraryItem(libraryItem)
       this.emitter('item_updated', libraryItem.toJSONExpanded())
diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index c8564fa3..78cd10f6 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -82,6 +82,11 @@ class PodcastController {
       Logger.info(`[PodcastController] Podcast created now starting ${payload.episodesToDownload.length} episode downloads`)
       this.podcastManager.downloadPodcastEpisodes(libraryItem, payload.episodesToDownload)
     }
+
+    // Turn on podcast auto download cron if not already on
+    if (libraryItem.media.autoDownloadEpisodes && !this.podcastManager.episodeScheduleTask) {
+      this.podcastManager.schedulePodcastEpisodeCron()
+    }
   }
 
   getPodcastFeed(req, res) {
@@ -105,5 +110,21 @@ class PodcastController {
       res.status(500).send(error)
     })
   }
+
+  async checkNewEpisodes(req, res) {
+    var libraryItem = this.db.getLibraryItem(req.params.id)
+    if (!libraryItem || libraryItem.mediaType !== 'podcast') {
+      return res.sendStatus(404)
+    }
+    if (!libraryItem.media.metadata.feedUrl) {
+      Logger.error(`[PodcastController] checkNewEpisodes no feed url for item ${libraryItem.id}`)
+      return res.status(500).send('Podcast has no rss feed url')
+    }
+
+    var newEpisodes = await this.podcastManager.checkPodcastForNewEpisodes(libraryItem)
+    res.json({
+      episodes: newEpisodes || []
+    })
+  }
 }
 module.exports = new PodcastController()
\ No newline at end of file
diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index 0deda722..58205178 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -24,15 +24,19 @@ class PodcastManager {
     this.episodeScheduleTask = null
   }
 
+  get serverSettings() {
+    return this.db.serverSettings || {}
+  }
+
   init() {
-    var podcastsWithAutoDownload = this.db.libraryItems.find(li => li.mediaType === 'podcast' && li.media.autoDownloadEpisodes)
-    if (podcastsWithAutoDownload.length) {
+    var podcastsWithAutoDownload = this.db.libraryItems.some(li => li.mediaType === 'podcast' && li.media.autoDownloadEpisodes)
+    if (podcastsWithAutoDownload) {
       this.schedulePodcastEpisodeCron()
     }
   }
 
   async downloadPodcastEpisodes(libraryItem, episodesToDownload) {
-    var index = 1
+    var index = libraryItem.media.episodes.length + 1
     episodesToDownload.forEach((ep) => {
       var newPe = new PodcastEpisode()
       newPe.setData(ep, index++)
@@ -115,33 +119,81 @@ class PodcastManager {
 
   schedulePodcastEpisodeCron() {
     try {
+      Logger.debug(`[PodcastManager] Scheduled podcast episode check cron "${this.serverSettings.podcastEpisodeSchedule}"`)
       this.episodeScheduleTask = cron.schedule(this.serverSettings.podcastEpisodeSchedule, this.checkForNewEpisodes.bind(this))
     } catch (error) {
-      Logger.error(`[PodcastManager] Failed to schedule podcast cron ${this.serverSettings.backupSchedule}`, error)
+      Logger.error(`[PodcastManager] Failed to schedule podcast cron ${this.serverSettings.podcastEpisodeSchedule}`, error)
     }
   }
 
-  checkForNewEpisodes() {
+  cancelCron() {
+    Logger.debug(`[PodcastManager] Canceled new podcast episode check cron`)
+    if (this.episodeScheduleTask) {
+      this.episodeScheduleTask.destroy()
+      this.episodeScheduleTask = null
+    }
+  }
+
+  async checkForNewEpisodes() {
     var podcastsWithAutoDownload = this.db.libraryItems.find(li => li.mediaType === 'podcast' && li.media.autoDownloadEpisodes)
-    for (const libraryItem of podcastsWithAutoDownload) {
+    if (!podcastsWithAutoDownload.length) {
+      this.cancelCron()
+      return
+    }
 
+    for (const libraryItem of podcastsWithAutoDownload) {
+      Logger.info(`[PodcastManager] checkForNewEpisodes Cron for "${libraryItem.media.metadata.title}"`)
+      var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem)
+      var hasUpdates = false
+      if (!newEpisodes) { // Failed
+        libraryItem.media.autoDownloadEpisodes = false
+        hasUpdates = true
+      } else if (newEpisodes.length) {
+        Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.metadata.title}" - starting download`)
+        this.downloadPodcastEpisodes(libraryItem, newEpisodes)
+        hasUpdates = true
+      }
+
+      if (hasUpdates) {
+        libraryItem.media.lastEpisodeCheck = Date.now()
+        libraryItem.updatedAt = Date.now()
+        await this.db.updateLibraryItem(libraryItem)
+        this.emitter('item_updated', libraryItem.toJSONExpanded())
+      }
     }
   }
 
-  getPodcastFeed(podcastMedia) {
-    axios.get(podcastMedia.feedUrl).then(async (data) => {
+  async checkPodcastForNewEpisodes(podcastLibraryItem) {
+    if (!podcastLibraryItem.media.metadata.feedUrl) {
+      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes no feed url for item ${podcastLibraryItem.id} - disabling auto download`)
+      return false
+    }
+    var feed = await this.getPodcastFeed(podcastLibraryItem.media.metadata.feedUrl)
+    if (!feed || !feed.episodes) {
+      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes invalid feed payload ${podcastLibraryItem.id} - disabling auto download`)
+      return false
+    }
+    // Filter new and not already has
+    var newEpisodes = feed.episodes.filter(ep => ep.publishedAt > podcastLibraryItem.media.lastEpisodeCheck && !podcastLibraryItem.media.checkHasEpisodeByFeedUrl(ep.enclosure.url))
+    // Max new episodes for safety = 2
+    newEpisodes = newEpisodes.slice(0, 2)
+    return newEpisodes
+  }
+
+  getPodcastFeed(feedUrl) {
+    return axios.get(feedUrl).then(async (data) => {
       if (!data || !data.data) {
         Logger.error('Invalid podcast feed request response')
-        return res.status(500).send('Bad response from feed request')
+        return false
       }
       var podcast = await parsePodcastRssFeedXml(data.data)
       if (!podcast) {
-        return res.status(500).send('Invalid podcast RSS feed')
+        return false
       }
-      res.json(podcast)
+      return podcast
     }).catch((error) => {
       console.error('Failed', error)
-      res.status(500).send(error)
+      return false
     })
   }
 }
diff --git a/server/objects/entities/PodcastEpisode.js b/server/objects/entities/PodcastEpisode.js
index 1c1266e1..934d8987 100644
--- a/server/objects/entities/PodcastEpisode.js
+++ b/server/objects/entities/PodcastEpisode.js
@@ -126,5 +126,10 @@ class PodcastEpisode {
     audioTrack.setData(libraryItemId, this.audioFile, 0)
     return [audioTrack]
   }
+
+  checkEqualsEnclosureUrl(url) {
+    if (!this.enclosure || !this.enclosure.url) return false
+    return this.enclosure.url == url
+  }
 }
 module.exports = PodcastEpisode
\ No newline at end of file
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index 0abb1ff0..afbc1800 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -15,6 +15,7 @@ class Podcast {
     this.episodes = []
 
     this.autoDownloadEpisodes = false
+    this.lastEpisodeCheck = 0
 
     this.lastCoverSearch = null
     this.lastCoverSearchQuery = null
@@ -30,6 +31,7 @@ class Podcast {
     this.tags = [...podcast.tags]
     this.episodes = podcast.episodes.map((e) => new PodcastEpisode(e))
     this.autoDownloadEpisodes = !!podcast.autoDownloadEpisodes
+    this.lastEpisodeCheck = podcast.lastEpisodeCheck || 0
   }
 
   toJSON() {
@@ -38,7 +40,8 @@ class Podcast {
       coverPath: this.coverPath,
       tags: [...this.tags],
       episodes: this.episodes.map(e => e.toJSON()),
-      autoDownloadEpisodes: this.autoDownloadEpisodes
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      lastEpisodeCheck: this.lastEpisodeCheck
     }
   }
 
@@ -49,6 +52,7 @@ class Podcast {
       tags: [...this.tags],
       episodes: this.episodes.map(e => e.toJSON()),
       autoDownloadEpisodes: this.autoDownloadEpisodes,
+      lastEpisodeCheck: this.lastEpisodeCheck,
       size: this.size
     }
   }
@@ -60,6 +64,7 @@ class Podcast {
       tags: [...this.tags],
       episodes: this.episodes.map(e => e.toJSONExpanded()),
       autoDownloadEpisodes: this.autoDownloadEpisodes,
+      lastEpisodeCheck: this.lastEpisodeCheck,
       size: this.size
     }
   }
@@ -135,6 +140,7 @@ class Podcast {
 
     this.coverPath = mediaMetadata.coverPath || null
     this.autoDownloadEpisodes = !!mediaMetadata.autoDownloadEpisodes
+    this.lastEpisodeCheck = Date.now() // Makes sure new episodes are after this
   }
 
   async syncMetadataFiles(textMetadataFiles, opfMetadataOverrideDetails) {
@@ -149,6 +155,9 @@ class Podcast {
   checkHasEpisode(episodeId) {
     return this.episodes.some(ep => ep.id === episodeId)
   }
+  checkHasEpisodeByFeedUrl(url) {
+    return this.episodes.some(ep => ep.checkEqualsEnclosureUrl(url))
+  }
 
   // Only checks container format
   checkCanDirectPlay(payload, episodeId) {
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 6545b104..3512d858 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -176,6 +176,7 @@ class ApiRouter {
     //
     this.router.post('/podcasts', PodcastController.create.bind(this))
     this.router.post('/podcasts/feed', PodcastController.getPodcastFeed.bind(this))
+    this.router.get('/podcasts/:id/checknew', PodcastController.checkNewEpisodes.bind(this))
 
     //
     // Misc Routes