diff --git a/homeassistant/components/input_select/services.yaml b/homeassistant/components/input_select/services.yaml
index 04a09e5366a..1c4d7c1a06d 100644
--- a/homeassistant/components/input_select/services.yaml
+++ b/homeassistant/components/input_select/services.yaml
@@ -17,7 +17,10 @@ select_option:
       required: true
       example: '"Item A"'
       selector:
-        text:
+        state:
+          exclude_states:
+            - unavailable
+            - unknown
 
 select_previous:
   target:
diff --git a/homeassistant/components/select/services.yaml b/homeassistant/components/select/services.yaml
index dc6d4c6815a..054dcea4ff8 100644
--- a/homeassistant/components/select/services.yaml
+++ b/homeassistant/components/select/services.yaml
@@ -27,7 +27,10 @@ select_option:
       required: true
       example: '"Item A"'
       selector:
-        text:
+        state:
+          exclude_states:
+            - unavailable
+            - unknown
 
 select_previous:
   target: