diff --git a/src/Components/ClusterRules/ClusterRules.js b/src/Components/ClusterRules/ClusterRules.js
index 9222ade1..d5115421 100644
--- a/src/Components/ClusterRules/ClusterRules.js
+++ b/src/Components/ClusterRules/ClusterRules.js
@@ -231,6 +231,7 @@ const ClusterRules = ({ cluster }) => {
   };
 
   const onSort = (_e, index, direction) => {
+    setExpandFirst(false);
     setFirstRule('');
     return updateFilters({
       ...filters,
diff --git a/src/Components/ClusterRules/ClusterRules.spec.ct.js b/src/Components/ClusterRules/ClusterRules.spec.ct.js
index 65d81a00..8d8f9572 100644
--- a/src/Components/ClusterRules/ClusterRules.spec.ct.js
+++ b/src/Components/ClusterRules/ClusterRules.spec.ct.js
@@ -186,9 +186,9 @@ describe('cluster rules table', () => {
   });
 
   describe('defaults', () => {
-    it('no expanded rows', () => {
+    it('only one row is expanded', () => {
       cy.get('#expanded-content1').should('have.length', 1);
-      cy.get(EXPANDABLES).should('have.length', 0);
+      cy.get(EXPANDABLES).should('have.length', 1);
     });
     it('no chips are displayed by default', () => {
       cy.get(CHIP_GROUP).should('not.exist');
@@ -208,13 +208,13 @@ describe('cluster rules table', () => {
   });
 
   it('expand one row then sort', () => {
-    cy.get(ROOT).find('#expandable-toggle0').click();
+    cy.get(ROOT).find('#expandable-toggle2').click();
     cy.get(ROOT)
       .find('th[data-label=Description]')
       .find('button')
       .click()
       .click();
-    cy.get('table').find('tr').find('td[id="expanded-content11"]');
+    cy.get(EXPANDABLES).should('have.length', 2);
   });
 
   describe('sorting', () => {