diff --git a/frontend/src/Store/Actions/interactiveImportActions.js b/frontend/src/Store/Actions/interactiveImportActions.js
index 565ab71df..634b2adba 100644
--- a/frontend/src/Store/Actions/interactiveImportActions.js
+++ b/frontend/src/Store/Actions/interactiveImportActions.js
@@ -169,7 +169,7 @@ export const actionHandlers = handleThunks({
         id,
         path: item.path,
         seriesId: item.series ? item.series.id : undefined,
-        season: item.season,
+        seasonNumber: item.seasonNumber,
         episodeIds: (item.episodes || []).map((e) => e.id),
         quality: item.quality,
         language: item.language,
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs
index 6441553e3..53b77d1db 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
     public interface IManualImportService
     {
         List<ManualImportItem> GetMediaFiles(string path, string downloadId, int? seriesId, bool filterExistingFiles);
-        ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, List<int> episodeIds, QualityModel quality, Language language);
+        ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, int? seasonNumber, List<int> episodeIds, QualityModel quality, Language language);
     }
 
     public class ManualImportService : IExecute<ManualImportCommand>, IManualImportService
@@ -96,7 +96,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
             return ProcessFolder(path, path, downloadId, seriesId, filterExistingFiles);
         }
 
-        public ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, List<int> episodeIds, QualityModel quality, Language language)
+        public ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, int? seasonNumber, List<int> episodeIds, QualityModel quality, Language language)
         {
             var rootFolder = Path.GetDirectoryName(path);
             var series = _seriesService.GetSeries(seriesId);
@@ -122,6 +122,32 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
                 return MapItem(_importDecisionMaker.GetDecision(localEpisode, downloadClientItem), rootFolder, downloadId, null);
             }
 
+            // This case will happen if the user selected a season, but didn't select the episodes in the season then changed the language or quality.
+            // Instead of overriding their season selection let it persist and reject it with an appropriate error.
+
+            if (seasonNumber.HasValue)
+            {
+                var downloadClientItem = GetTrackedDownload(downloadId)?.DownloadItem;
+
+                var localEpisode = new LocalEpisode
+                                   {
+                                       Series = series,
+                                       Episodes = new List<Episode>(),
+                                       FileEpisodeInfo = Parser.Parser.ParsePath(path),
+                                       DownloadClientEpisodeInfo = downloadClientItem == null
+                                           ? null
+                                           : Parser.Parser.ParseTitle(downloadClientItem.Title),
+                                       Path = path,
+                                       SceneSource = SceneSource(series, rootFolder),
+                                       ExistingFile = series.Path.IsParentPath(path),
+                                       Size = _diskProvider.GetFileSize(path),
+                                       Language = language,
+                                       Quality = quality
+                                   };
+
+                return MapItem(new ImportDecision(localEpisode, new Rejection("Episodes not selected")), rootFolder, downloadId, null);
+            }
+
             return ProcessFile(rootFolder, rootFolder, path, downloadId, series);
         }
 
diff --git a/src/Sonarr.Api.V3/ManualImport/ManualImportModule.cs b/src/Sonarr.Api.V3/ManualImport/ManualImportModule.cs
index 1568b37a0..1c73a840e 100644
--- a/src/Sonarr.Api.V3/ManualImport/ManualImportModule.cs
+++ b/src/Sonarr.Api.V3/ManualImport/ManualImportModule.cs
@@ -38,7 +38,7 @@ namespace Sonarr.Api.V3.ManualImport
 
             foreach (var item in items)
             {
-                var processedItem = _manualImportService.ReprocessItem(item.Path, item.DownloadId, item.SeriesId, item.EpisodeIds ?? new List<int>(), item.Quality, item.Language);
+                var processedItem = _manualImportService.ReprocessItem(item.Path, item.DownloadId, item.SeriesId, item.SeasonNumber, item.EpisodeIds ?? new List<int>(), item.Quality, item.Language);
 
                 item.SeasonNumber = processedItem.SeasonNumber;
                 item.Episodes = processedItem.Episodes.ToResource();