diff --git a/cypress/support/percy.ts b/cypress/support/percy.ts
index ae35248789b..0b2c10c90ec 100644
--- a/cypress/support/percy.ts
+++ b/cypress/support/percy.ts
@@ -47,8 +47,15 @@ Cypress.Commands.add("percySnapshotElement", { prevSubject: "element" }, (subjec
         // Await inline spinners to vanish
         cy.get(".mx_InlineSpinner", { log: false }).should("not.exist");
     }
+
+    let selector = subject.selector;
+    // cy.findByTestId sets the selector to `findByTestId(<testId>)`
+    // which is not usable as a scope
+    if (selector.startsWith("findByTestId")) {
+        selector = `[data-testid="${subject.attr("data-testid")}"]`;
+    }
     cy.percySnapshot(name, {
-        domTransformation: (documentClone) => scope(documentClone, subject.selector),
+        domTransformation: (documentClone) => scope(documentClone, selector),
         ...options,
     });
 });