diff --git a/Jellyfin.Plugin.MediaCleaner/Controllers/SonarrController.cs b/Jellyfin.Plugin.MediaCleaner/Controllers/SonarrController.cs
index e8ab208..6a6bcd2 100644
--- a/Jellyfin.Plugin.MediaCleaner/Controllers/SonarrController.cs
+++ b/Jellyfin.Plugin.MediaCleaner/Controllers/SonarrController.cs
@@ -59,24 +59,20 @@ public class SonarrController : Controller
         }
 
         var seasonNumbers = new HashSet<int>(sonarrSeries.Seasons
-            .Where(s => s.SeasonNumber.HasValue)
-            .Select(s => s.SeasonNumber!.Value));
+            .Select(s => s.SeasonNumber));
 
         var staleEpisodesResponseObj = episodesResponseObj
-            .Where(episodeDeletionDetail => episodeDeletionDetail.SeasonNumber != null &&
-                        seasonNumbers.Contains(episodeDeletionDetail.SeasonNumber.Value))
+            .Where(episodeDeletionDetail => seasonNumbers.Contains(episodeDeletionDetail.SeasonNumber))
             .ToList();
 
         var episodeIds = staleEpisodesResponseObj
+            .Where(episodeDeletionDetail => episodeDeletionDetail.HasFile)
             .Select(episodeDeletionDetail => episodeDeletionDetail.EpisodeId)
-            .Where(id => id.HasValue)
-            .Select(id => id!.Value)
             .ToList();
 
         var episodeFileIds = staleEpisodesResponseObj
+            .Where(episodeDeletionDetail => episodeDeletionDetail.HasFile)
             .Select(episodeDeletionDetail => episodeDeletionDetail.EpisodeFileId)
-            .Where(id => id.HasValue)
-            .Select(id => id!.Value)
             .ToList();
 
         return Ok(new EpisodeIdLists(episodeIds, episodeFileIds));
diff --git a/Jellyfin.Plugin.MediaCleaner/Models/EpisodeDeletionDetails.cs b/Jellyfin.Plugin.MediaCleaner/Models/EpisodeDeletionDetails.cs
index 0d1feec..71f74be 100644
--- a/Jellyfin.Plugin.MediaCleaner/Models/EpisodeDeletionDetails.cs
+++ b/Jellyfin.Plugin.MediaCleaner/Models/EpisodeDeletionDetails.cs
@@ -3,7 +3,8 @@ using System.Text.Json.Serialization;
 namespace Jellyfin.Plugin.MediaCleaner.Models;
 
 public record EpisodeDeletionDetails(
-    [property: JsonPropertyName("id")] int? EpisodeId,
-    [property: JsonPropertyName("episodeFileId")] int? EpisodeFileId,
-    [property: JsonPropertyName("seasonNumber")] int? SeasonNumber
+    [property: JsonPropertyName("id")] int EpisodeId,
+    [property: JsonPropertyName("episodeFileId")] int EpisodeFileId,
+    [property: JsonPropertyName("seasonNumber")] int SeasonNumber,
+    [property: JsonPropertyName("hasFile")] bool HasFile
 );
diff --git a/Jellyfin.Plugin.MediaCleaner/Models/SonarrSeries.cs b/Jellyfin.Plugin.MediaCleaner/Models/SonarrSeries.cs
index fc4a330..8ed2ba6 100644
--- a/Jellyfin.Plugin.MediaCleaner/Models/SonarrSeries.cs
+++ b/Jellyfin.Plugin.MediaCleaner/Models/SonarrSeries.cs
@@ -14,5 +14,5 @@ public record SonarrSeries(
 );
 
 public record Season(
-    [property: JsonPropertyName("seasonNumber")] int? SeasonNumber
+    [property: JsonPropertyName("seasonNumber")] int SeasonNumber
 );