diff --git a/cypress/integration/layers/thematiclayer.cy.js b/cypress/integration/layers/thematiclayer.cy.js
index 37028a313..c290928b8 100644
--- a/cypress/integration/layers/thematiclayer.cy.js
+++ b/cypress/integration/layers/thematiclayer.cy.js
@@ -104,7 +104,8 @@ context('Thematic Layers', () => {
             .selectIndicatorGroup('Stock')
             .selectIndicator('BCG Stock PHU')
             .selectTab('Period')
-            .selectRelativePeriod('This month')
+            .typeStartDate(`${CURRENT_YEAR}-11-01`)
+            .typeEndDate(`${CURRENT_YEAR}-11-30`)
             .selectTab('Style')
             .selectIncludeNoDataOU()
             .selectTab('Org Units')
@@ -138,7 +139,7 @@ context('Thematic Layers', () => {
         cy.get('#dhis2-map-container')
             .findByDataTest('dhis2-uicore-componentcover', EXTENDED_TIMEOUT)
             .should('not.exist')
-        cy.get('.dhis2-map').click('center') //Click somewhere on the map
+        cy.get('.dhis2-map').click('center') //Click in the middle of the map
 
         cy.get('.maplibregl-popup').contains('Value: 0').should('be.visible')
 
@@ -159,7 +160,7 @@ context('Thematic Layers', () => {
         cy.get('#dhis2-map-container')
             .findByDataTest('dhis2-uicore-componentcover', EXTENDED_TIMEOUT)
             .should('not.exist')
-        cy.get('.dhis2-map').click('center') //Click somewhere on the map
+        cy.get('.dhis2-map').click('center') //Click in the middle of the map
 
         cy.get('.maplibregl-popup')
             .contains('Value: No data')