diff --git a/.cypress/integration/event_analytics_test/event_analytics.spec.js b/.cypress/integration/event_analytics_test/event_analytics.spec.js
index fe07517ea..f002c700c 100644
--- a/.cypress/integration/event_analytics_test/event_analytics.spec.js
+++ b/.cypress/integration/event_analytics_test/event_analytics.spec.js
@@ -281,8 +281,15 @@ describe('Override timestamp for an index', () => {
     clearQuerySearchBoxText('searchAutocompleteTextArea');
     cy.get('[data-test-subj="searchAutocompleteTextArea"]').type(TEST_QUERIES[2].query);
     cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
+    cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
     cy.get('.tab-title').contains('Events').click();
-    cy.get('[data-test-subj="eventExplorer__overrideDefaultTimestamp"]').click({ force: true });
+    cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
+    cy.get('[data-test-subj="eventExplorer__overrideDefaultTimestamp"]')
+    .then(($elements) => {
+      // Handle redux state bug in main not setting default timestamp for cypress
+      const indexToClick = $elements.length > 1 ? 1 : 0;
+      cy.wrap($elements.eq(indexToClick)).click({ force: true });
+    });
 
     cy.get('[data-attr-field="utc_time"] [data-test-subj="eventFields__default-timestamp-mark"')
       .contains('Default Timestamp')