diff --git a/.github/workflows/cypress-component.yml b/.github/workflows/cypress-component.yml
index 696424dc9d..73cf5987a5 100644
--- a/.github/workflows/cypress-component.yml
+++ b/.github/workflows/cypress-component.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Set up node from version file
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
         with:
           cache: 'npm'
           cache-dependency-path: package-lock.json
diff --git a/.github/workflows/cypress-custom.yml b/.github/workflows/cypress-custom.yml
index a0a66be2cc..c5d91225b7 100644
--- a/.github/workflows/cypress-custom.yml
+++ b/.github/workflows/cypress-custom.yml
@@ -88,7 +88,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up node from version file
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
         with:
           cache: 'npm'
           cache-dependency-path: apps/${{ env.APP_NAME}}/package-lock.json
@@ -103,7 +103,7 @@ jobs:
 
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
         with:
           node-version: ${{ matrix.node-version }}
 
diff --git a/cypress/e2e/column-datetime.cy.js b/cypress/e2e/column-datetime.cy.js
index 2c058b81f0..9184f0d529 100644
--- a/cypress/e2e/column-datetime.cy.js
+++ b/cypress/e2e/column-datetime.cy.js
@@ -39,6 +39,9 @@ describe('Test column ' + columnTitle, () => {
 		cy.get('.NcTable tr td button').first().click()
 		cy.get('button').contains('Delete').click()
 		cy.get('button').contains('I really').click()
+		// wait for the delete to finish and the row route to close before the next test starts
+		cy.get('.modal__content').should('not.exist')
+		cy.url().should('not.contain', '/row/')
 	})
 
 	it('Insert and test rows - default now', () => {
diff --git a/cypress/e2e/column-datetimeDate.cy.js b/cypress/e2e/column-datetimeDate.cy.js
index 77f6733436..35a11f8fd0 100644
--- a/cypress/e2e/column-datetimeDate.cy.js
+++ b/cypress/e2e/column-datetimeDate.cy.js
@@ -39,6 +39,9 @@ describe('Test column ' + columnTitle, () => {
 		cy.get('.NcTable tr td button').first().click()
 		cy.get('button').contains('Delete').click()
 		cy.get('button').contains('I really').click()
+		// wait for the delete to finish and the row route to close before the next test starts
+		cy.get('.modal__content').should('not.exist')
+		cy.url().should('not.contain', '/row/')
 	})
 
 	it('Insert and test rows - default now', () => {
diff --git a/cypress/e2e/column-datetimeTime.cy.js b/cypress/e2e/column-datetimeTime.cy.js
index 95a311be2d..5f11f9bfae 100644
--- a/cypress/e2e/column-datetimeTime.cy.js
+++ b/cypress/e2e/column-datetimeTime.cy.js
@@ -36,6 +36,9 @@ describe('Test column ' + columnTitle, () => {
 		cy.get('.NcTable tr td button').first().click()
 		cy.get('button').contains('Delete').click()
 		cy.get('button').contains('I really').click()
+		// wait for the delete to finish and the row route to close before the next test starts
+		cy.get('.modal__content').should('not.exist')
+		cy.url().should('not.contain', '/row/')
 	})
 
 	it('Insert and test rows - default now', () => {
diff --git a/cypress/e2e/column-selection-multi.cy.js b/cypress/e2e/column-selection-multi.cy.js
index 2296ccb264..804067a94e 100644
--- a/cypress/e2e/column-selection-multi.cy.js
+++ b/cypress/e2e/column-selection-multi.cy.js
@@ -66,6 +66,9 @@ describe('Test column ' + columnTitle, () => {
 		cy.get('.NcTable tr td button').first().click()
 		cy.get('button').contains('Delete').click()
 		cy.get('button').contains('I really').click()
+		// wait for the delete to finish and the row route to close before the next test starts
+		cy.get('.modal__content').should('not.exist')
+		cy.url().should('not.contain', '/row/')
 	})
 
 	it('Test empty selection', () => {