diff --git a/bazarr/subtitles/upgrade.py b/bazarr/subtitles/upgrade.py
index 4593c71bc..1c565bd0d 100644
--- a/bazarr/subtitles/upgrade.py
+++ b/bazarr/subtitles/upgrade.py
@@ -69,14 +69,12 @@ def upgrade_subtitles():
             .join(TableEpisodes, onclause=TableHistory.sonarrEpisodeId == TableEpisodes.sonarrEpisodeId)
             .join(episodes_to_upgrade, onclause=TableHistory.id == episodes_to_upgrade.c.id, isouter=True)
             .where(episodes_to_upgrade.c.id.is_not(None)))
-            .all() if _language_still_desired(x.language, x.profileId)]
+            .all() if _language_still_desired(x.language, x.profileId) and
+            x.subtitles_path in x.external_subtitles and
+            x.video_path == x.path
+        ]
 
         for item in episodes_data:
-            if item['upgradable']:
-                if item['subtitles_path'] not in item['external_subtitles'] or \
-                        not item['video_path'] == item['path']:
-                    item.update({"upgradable": False})
-
             del item['path']
             del item['external_subtitles']
 
@@ -156,14 +154,12 @@ def upgrade_subtitles():
             .join(TableMovies, onclause=TableHistoryMovie.radarrId == TableMovies.radarrId)
             .join(movies_to_upgrade, onclause=TableHistoryMovie.id == movies_to_upgrade.c.id, isouter=True)
             .where(movies_to_upgrade.c.id.is_not(None)))
-            .all() if _language_still_desired(x.language, x.profileId)]
+            .all() if _language_still_desired(x.language, x.profileId) and
+            x.subtitles_path in x.external_subtitles and
+            x.video_path == x.path
+        ]
 
         for item in movies_data:
-            if item['upgradable']:
-                if item['subtitles_path'] not in item['external_subtitles'] or \
-                        not item['video_path'] == item['path']:
-                    item.update({"upgradable": False})
-
             del item['path']
             del item['external_subtitles']