diff --git a/frontend/cypress/e2e/side_window/reporting/filters.spec.ts b/frontend/cypress/e2e/side_window/reporting/filters.spec.ts
index 3857610c61..11f98d9546 100644
--- a/frontend/cypress/e2e/side_window/reporting/filters.spec.ts
+++ b/frontend/cypress/e2e/side_window/reporting/filters.spec.ts
@@ -96,6 +96,7 @@ context('Reportings', () => {
   })
 
   it('Should filter reportings by themes', () => {
+    cy.wait(200)
     cy.fill('Thématiques', ['Arrêté à visa environnemental'])
     cy.getDataCy('reportings-filter-tags').find('.Component-SingleTag > span').contains('Arrêté à visa environnemental')
 
@@ -232,10 +233,10 @@ context('Reportings', () => {
     cy.wait(500)
     cy.wait('@getReportings')
 
-    cy.get('*[data-cy="reporting-theme-filter"]').click()
+    cy.getDataCy('reporting-theme-filter').click()
     cy.get('#themes-listbox > div').should('have.length', 34)
 
-    cy.get('*[data-cy="reporting-sub-theme-filter"]').click()
+    cy.getDataCy('reporting-sub-theme-filter').click()
     cy.get('#subThemes-listbox > div').should('have.length', 161)
   })
 })
diff --git a/frontend/src/features/Reportings/Filters/Table/index.tsx b/frontend/src/features/Reportings/Filters/Table/index.tsx
index b356fa28f9..7463e37082 100644
--- a/frontend/src/features/Reportings/Filters/Table/index.tsx
+++ b/frontend/src/features/Reportings/Filters/Table/index.tsx
@@ -200,7 +200,7 @@ export function TableReportingsFiltersWithRef(
             value={targetTypeFilter}
           />
           <CheckPicker
-            key={themesOptions.length}
+            key={`theme${themesOptions.length}${JSON.stringify(themeFilter)}`}
             customSearch={themeCustomSearch}
             data-cy="reporting-theme-filter"
             isLabelHidden
@@ -216,7 +216,7 @@ export function TableReportingsFiltersWithRef(
             value={themeFilter}
           />
           <CheckPicker
-            key={subThemesOptions.length}
+            key={`subtheme${subThemesOptions.length}${JSON.stringify(subThemesFilter)}`}
             customSearch={subThemeCustomSearch}
             data-cy="reporting-sub-theme-filter"
             isLabelHidden