diff --git a/app/Models/EpisodeModel.php b/app/Models/EpisodeModel.php
index 4af946e5..b5ef60d2 100644
--- a/app/Models/EpisodeModel.php
+++ b/app/Models/EpisodeModel.php
@@ -324,10 +324,8 @@ class EpisodeModel extends UuidModel
     {
         $result = $this->builder()
             ->selectMax('season_number', 'current_season_number')
-            ->where([
-                'podcast_id'          => $podcastId,
-                'published_at IS NOT' => null,
-            ])
+            ->where('podcast_id', $podcastId)
+            ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
             ->get()
             ->getResultArray();
 
@@ -339,10 +337,11 @@ class EpisodeModel extends UuidModel
         $result = $this->builder()
             ->selectMax('number', 'next_episode_number')
             ->where([
-                'podcast_id'          => $podcastId,
-                'season_number'       => $seasonNumber,
-                'published_at IS NOT' => null,
-            ])->get()
+                'podcast_id'    => $podcastId,
+                'season_number' => $seasonNumber,
+            ])
+            ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
+            ->get()
             ->getResultArray();
 
         return (int) $result[0]['next_episode_number'] + 1;
@@ -357,10 +356,9 @@ class EpisodeModel extends UuidModel
             ->select(
                 'COUNT(DISTINCT season_number) as number_of_seasons, COUNT(*) as number_of_episodes, MIN(published_at) as first_published_at'
             )
-            ->where([
-                'podcast_id'          => $podcastId,
-                'published_at IS NOT' => null,
-            ])->get()
+            ->where('podcast_id', $podcastId)
+            ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
+            ->get()
             ->getResultArray();
 
         $stats = [
diff --git a/app/Models/PodcastModel.php b/app/Models/PodcastModel.php
index aa905ba2..9c228e1d 100644
--- a/app/Models/PodcastModel.php
+++ b/app/Models/PodcastModel.php
@@ -245,9 +245,8 @@ class PodcastModel extends Model
                 ->builder()
                 ->select('YEAR(published_at) as year, count(*) as number_of_episodes')
                 ->where([
-                    'podcast_id'          => $podcastId,
-                    'season_number'       => null,
-                    'published_at IS NOT' => null,
+                    'podcast_id'    => $podcastId,
+                    'season_number' => null,
                 ])
                 ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
                 ->groupBy('year')
@@ -284,7 +283,6 @@ class PodcastModel extends Model
                 ->where([
                     'podcast_id'           => $podcastId,
                     'season_number is not' => null,
-                    'published_at IS NOT'  => null,
                 ])
                 ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
                 ->groupBy('season_number')