diff --git a/server/api/themoviedb/interfaces.ts b/server/api/themoviedb/interfaces.ts
index 2282fe05..c39ac637 100644
--- a/server/api/themoviedb/interfaces.ts
+++ b/server/api/themoviedb/interfaces.ts
@@ -191,7 +191,7 @@ export interface TmdbVideo {
 
 export interface TmdbTvEpisodeResult {
   id: number;
-  air_date: string;
+  air_date: string | null;
   episode_number: number;
   name: string;
   overview: string;
diff --git a/server/models/Tv.ts b/server/models/Tv.ts
index 7f809cbf..fb719bef 100644
--- a/server/models/Tv.ts
+++ b/server/models/Tv.ts
@@ -29,7 +29,7 @@ import type { Video } from './Movie';
 interface Episode {
   id: number;
   name: string;
-  airDate: string;
+  airDate: string | null;
   episodeNumber: number;
   overview: string;
   productionCode: string;
diff --git a/src/components/TvDetails/Season/index.tsx b/src/components/TvDetails/Season/index.tsx
index a8f45764..40eb3337 100644
--- a/src/components/TvDetails/Season/index.tsx
+++ b/src/components/TvDetails/Season/index.tsx
@@ -41,7 +41,9 @@ const Season = ({ seasonNumber, tvId }: SeasonProps) => {
               <div className="flex-1">
                 <div className="flex flex-col space-y-2 xl:flex-row xl:items-center xl:space-y-0 xl:space-x-2">
                   <h3 className="text-lg">{episode.name}</h3>
-                  <AirDateBadge airDate={episode.airDate} />
+                  {episode.airDate && (
+                    <AirDateBadge airDate={episode.airDate} />
+                  )}
                 </div>
                 {episode.overview && <p>{episode.overview}</p>}
               </div>
diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx
index 50643aa1..fdcc61a4 100644
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -829,6 +829,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
               </div>
             )}
             {data.nextEpisodeToAir &&
+              data.nextEpisodeToAir.airDate &&
               data.nextEpisodeToAir.airDate !== data.firstAirDate && (
                 <div className="media-fact">
                   <span>{intl.formatMessage(messages.nextAirDate)}</span>