diff --git a/src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php b/src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php
index 7aa8940..3f48599 100644
--- a/src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php
@@ -44,7 +44,18 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 
             $episodeData = $this->tmdb->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getImdbId(), $monitor->getSeason(), $monitor->getEpisode());
 
-            if (null === $monitor->getAirDate() && null !== $episodeData->episodeAirDate && "" !== $episodeData->episodeAirDate) {
+            if (null === $episodeData->episodeAirDate || "" !== $episodeData->episodeAirDate) {
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode does not have an air date, skipping for now');
+                return new MonitorTvEpisodeResult(
+                    status: 'OK',
+                    result: [
+                        'message' => 'No change',
+                        'monitor' => $monitor,
+                    ]
+                );
+            }
+
+            if (null === $monitor->getAirDate()) {
                 $monitor->setAirDate(Carbon::parse($episodeData->episodeAirDate));
             }