diff --git a/src/routes/_components/Select.html b/src/routes/_components/Select.html
index 14d5a873..22d90066 100644
--- a/src/routes/_components/Select.html
+++ b/src/routes/_components/Select.html
@@ -1,5 +1,5 @@
 <div class="select-wrapper {className || ''}">
-  <select on:change>
+  <select on:change aria-label={label}>
     {#each options as option (option.value)}
       <option value="{option.value}" selected="{option.value === defaultValue ? 'selected' : ''}">
         {option.label}
diff --git a/src/routes/_components/compose/ComposePoll.html b/src/routes/_components/compose/ComposePoll.html
index 75f6684b..5a751e8c 100644
--- a/src/routes/_components/compose/ComposePoll.html
+++ b/src/routes/_components/compose/ComposePoll.html
@@ -5,7 +5,6 @@
              maxlength="25"
              on:change="onChange(i)"
              placeholder="Choice {i + 1}"
-             aria-labelledby="poll-option-label-{realm}-{i}"
 
       >
       <IconButton
@@ -28,6 +27,7 @@
             options={pollExpiryOptions}
             defaultValue={pollExpiryDefaultValue}
             on:change="onExpiryChange(event)"
+            label="Poll duration"
     />
   </div>
   <IconButton