diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.js
index 649c3936290c9..c9f385ec367cf 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.js
@@ -221,9 +221,7 @@ uiModules.get('apps/management')
       const dateFields = fields.filter(field => field.type === 'date');
 
       if (dateFields.length === 0) {
-        return [{
-          display: `The indices which match this index pattern don't contain any time fields.`,
-        }];
+        return [];
       }
 
       return [
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html
index 231dbb28f06a9..1cd852c7210a3 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html
@@ -73,6 +73,7 @@ <h2 class="euiTitle euiTitle--small">
       </select>
 
       <svg
+        ng-hide="stepTimeField.canShowNoTimeBasedFieldsMessage()"
         class="euiIcon euiFormControlLayout__icon euiFormControlLayout__icon--right euiIcon--medium"
         xmlns="http://www.w3.org/2000/svg"
         xmlns:xlink="http://www.w3.org/1999/xlink"