diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py
index 722ff52b..f530cce6 100644
--- a/lib/logitech_receiver/settings_templates.py
+++ b/lib/logitech_receiver/settings_templates.py
@@ -477,9 +477,8 @@ def _feature_change_host_callback(device):
     choices = _NamedInts()
     for host in range(0, numHosts):
         paired, hostName = hostNames.get(host, (True, ''))
-        if paired:
-            choices[host] = str(host + 1) + ':' + hostName if hostName else str(host + 1)
-    return _ChoicesV(choices, read_skip_byte_count=1) if choices else None
+        choices[host] = str(host + 1) + ':' + hostName if hostName else str(host + 1)
+    return _ChoicesV(choices, read_skip_byte_count=1) if choices and len(choices) > 1 else None
 
 
 def _feature_change_host():