diff --git a/VERSION b/VERSION
index e5b8b499..03ba0f34 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.1-develop17
+1.17.1-develop18
diff --git a/modules/radarr.py b/modules/radarr.py
index 8e1dcd16..e0c87a4e 100644
--- a/modules/radarr.py
+++ b/modules/radarr.py
@@ -221,6 +221,7 @@ class Radarr:
 
     def get_tmdb_ids(self, method, data):
         ids = []
+        allowed = [t.id for t in self.api.all_tags() if t.label.lower() in data] if method == "radarr_taglist" else []
         for movie in self.api.all_movies():
             append = False
             if method == "radarr_all":
@@ -228,7 +229,7 @@ class Radarr:
             elif method == "radarr_taglist":
                 if data:
                     for tag in movie.tags:
-                        if tag.label.lower() in data:
+                        if tag.id in allowed:
                             append = True
                             break
                 elif not movie.tags:
diff --git a/modules/sonarr.py b/modules/sonarr.py
index 9ad4e3b5..df6d6daa 100644
--- a/modules/sonarr.py
+++ b/modules/sonarr.py
@@ -247,6 +247,7 @@ class Sonarr:
 
     def get_tvdb_ids(self, method, data):
         ids = []
+        allowed = [t.id for t in self.api.all_tags() if t.label.lower() in data] if method == "sonarr_taglist" else []
         for series in self.api.all_series():
             append = False
             if method == "sonarr_all":
@@ -254,7 +255,7 @@ class Sonarr:
             elif method == "sonarr_taglist":
                 if data:
                     for tag in series.tags:
-                        if tag.label.lower() in data:
+                        if tag.id in allowed:
                             append = True
                             break
                 elif not series.tags: