diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
index d3f07adfe2..b0bdfef1e0 100644
--- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
+++ b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
@@ -186,6 +186,13 @@ And you select the events scheduled today
 And you apply the current filter
 Then you see the selected option in the scheduledAt filter
 
+@v>=39
+Scenario: The program stage working list configureation is kept when navigating
+Given you open the main page with Ngelehun and WHO RMNCH Tracker context and configure a program stage working list
+When you open an enrollment event from the working list
+And you go back using the browser button
+Then the program stage working list is loaded
+
 @v>=40
 Scenario: The user creates, updates and deletes a Program stage custom working list
 Given you open the main page with Ngelehun and Malaria case diagnosis and Household investigation context
diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
index 7e5825c8a1..760319bfba 100644
--- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
+++ b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -760,3 +760,42 @@ Then('the program stage custom working list filters are loaded', () => {
         .should('have.length', 2);
 });
 
+Given('you open the main page with Ngelehun and WHO RMNCH Tracker context and configure a program stage working list', () => {
+    cy.visit('#/?programId=WSGAb5XwJ3Y&orgUnitId=DiszpKrYNg8');
+    cy.get('[data-test="template-selector-create-list"]')
+        .click();
+
+    cy.get('[data-test="tei-working-lists"]')
+        .within(() => {
+            cy.contains('More filters')
+                .click();
+            cy.contains('Program stage')
+                .click();
+        });
+
+    cy.get('[data-test="list-view-filter-contents"]')
+        .contains('Postpartum care visit')
+        .click();
+
+    cy.get('[data-test="list-view-filter-apply-button"]')
+        .click();
+});
+
+When('you open an enrollment event from the working list', () => {
+    cy.contains('Linda')
+        .click();
+});
+
+When('you go back using the browser button', () => {
+    cy.go('back');
+});
+
+Then('the program stage working list is loaded', () => {
+    cy.get('[data-test="tei-working-lists"]')
+        .find('[data-test="more-filters"]')
+        .should('have.length', 2);
+
+    cy.get('[data-test="tei-working-lists"]')
+        .contains('WHOMCH Hemoglobin value')
+        .should('exist');
+});
diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js
index 2516e630a1..b5ac794c5d 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js
+++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js
@@ -51,7 +51,8 @@ export const TeiWorkingListsReduxProvider = ({
         selectedTemplateId !== `${programId}-default` &&
         onSelectTemplate &&
         onSelectTemplate(selectedTemplateId);
-    }, [selectedTemplateId, programId, onSelectTemplate]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     const onSelectListRow = useCallback(({ id }) => {
         const record = records[id];