diff --git a/custom_components/plex_assistant/__init__.py b/custom_components/plex_assistant/__init__.py
index 4454127..73d79b9 100644
--- a/custom_components/plex_assistant/__init__.py
+++ b/custom_components/plex_assistant/__init__.py
@@ -106,9 +106,9 @@ def handle_input(call):
             PA.lib = get_libraries(PA.plex)
 
         try:
-            device = fuzzy(command["device"] or default_cast,
-                           PA.device_names + PA.client_names)
-            alias = fuzzy(command["device"], PA.alias_names)
+            devices = PA.device_names + PA.client_names
+            device = fuzzy(command["device"] or default_cast, devices)
+            alias = fuzzy(command["device"] or default_cast, PA.alias_names)
             name = aliases[alias[0]] if alias[1] > device[1] else device[0]
             cast = PA.devices[name] if name in PA.device_names else name
         except Exception: