diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
index b8a8331b70..6fa0dd2d3c 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
@@ -460,10 +460,21 @@ export class QueryBarInputUI extends Component<Props, State> {
         <div
           style={{ position: 'relative' }}
           role="combobox"
+          aria-label={this.props.intl.formatMessage(
+            {
+              id: 'data.query.queryBar.comboboxAriaLabel',
+              defaultMessage: 'Search and filter the {pageType} page',
+            },
+            {
+              pageType: this.props.appName,
+            }
+          )}
           aria-haspopup="true"
           aria-expanded={this.state.isSuggestionsVisible}
-          aria-owns="kbnTypeahead__items"
-          aria-controls="kbnTypeahead__items"
+          {...(this.state.isSuggestionsVisible && {
+            'aria-controls': 'kbnTypeahead__items',
+            'aria-owns': 'kbnTypeahead__items',
+          })}
         >
           <div role="search">
             <div className="kuiLocalSearchAssistedInput">
@@ -486,28 +497,23 @@ export class QueryBarInputUI extends Component<Props, State> {
                 }}
                 autoComplete="off"
                 spellCheck={false}
-                aria-label={
-                  this.props.screenTitle
-                    ? this.props.intl.formatMessage(
-                        {
-                          id: 'data.query.queryBar.searchInputAriaLabel',
-                          defaultMessage:
-                            'You are on search box of {previouslyTranslatedPageTitle} page. Start typing to search and filter the {pageType}',
-                        },
-                        {
-                          previouslyTranslatedPageTitle: this.props.screenTitle,
-                          pageType: this.props.appName,
-                        }
-                      )
-                    : undefined
-                }
+                aria-label={this.props.intl.formatMessage(
+                  {
+                    id: 'data.query.queryBar.searchInputAriaLabel',
+                    defaultMessage: 'Start typing to search and filter the {pageType} page',
+                  },
+                  {
+                    pageType: this.props.appName,
+                  }
+                )}
                 type="text"
                 data-test-subj="queryInput"
                 aria-autocomplete="list"
-                aria-controls="kbnTypeahead__items"
-                aria-activedescendant={
-                  this.state.isSuggestionsVisible ? 'suggestion-' + this.state.index : ''
-                }
+                {...(this.state.isSuggestionsVisible && { 'aria-controls': 'kbnTypeahead__items' })}
+                {...(this.state.isSuggestionsVisible &&
+                  typeof this.state.index === 'number' && {
+                    'aria-activedescendant': `suggestion-${this.state.index}`,
+                  })}
                 role="textbox"
                 prepend={this.props.prepend}
                 append={