Closes #3452895
This is the same as the other MR for this issue but with Cypress test instead of Vitest