diff --git a/app/Models/PodcastModel.php b/app/Models/PodcastModel.php
index d67c925dd4ba281b7391966cf33033cf0950152d..84da5147190da7732e0467f94a7de0f442c3b37c 100644
--- a/app/Models/PodcastModel.php
+++ b/app/Models/PodcastModel.php
@@ -357,8 +357,14 @@ class PodcastModel extends Model
                 ];
             }
 
+            $secondsToNextUnpublishedEpisode = (new EpisodeModel())->getSecondsToNextUnpublishedEpisode($podcastId);
+
             cache()
-                ->save($cacheName, $defaultQuery, DECADE);
+                ->save(
+                    $cacheName,
+                    $defaultQuery,
+                    $secondsToNextUnpublishedEpisode ? $secondsToNextUnpublishedEpisode : DECADE
+                );
         }
         return $defaultQuery;
     }