diff --git a/apps/global/virtualsensors.yaml b/apps/global/virtualsensors.yaml
index 131f776..0f5d3c6 100644
--- a/apps/global/virtualsensors.yaml
+++ b/apps/global/virtualsensors.yaml
@@ -52,9 +52,9 @@ virtual_sensors:
         disable_conditions: binary_sensor.vertex2_unreachable
       sensor_attributes:
         icon: sensor.vertex2_input_selected_icon
-    binary_sensor.is_using_apple_tv: binary_sensor.is_apple_tv_on and binary_sensor.vertex2_has_input_signal #and select.hdfury_vertex2_07_port_select_tx0 == 0
-    binary_sensor.is_using_xbox: binary_sensor.is_xbox_on and binary_sensor.vertex2_has_input_signal #and select.hdfury_vertex2_07_port_select_tx0 == 1
-    binary_sensor.is_using_playstation: binary_sensor.is_playstation_on and binary_sensor.vertex2_has_input_signal #and select.hdfury_vertex2_07_port_select_tx0 == 2
+    binary_sensor.is_using_apple_tv: binary_sensor.is_apple_tv_on and binary_sensor.vertex2_has_input_signal and sensor.vertex2_input_selected == 'AppleTV'
+    binary_sensor.is_using_xbox: binary_sensor.is_xbox_on and binary_sensor.vertex2_has_input_signal and sensor.vertex2_input_selected == 'Xbox'
+    binary_sensor.is_using_playstation: binary_sensor.is_playstation_on and binary_sensor.vertex2_has_input_signal and sensor.vertex2_input_selected == 'Playstation'
 
 
     continuous_condition.is_vertex2_content_idle: