diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js b/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js
index 623d5078e7..f772620fb9 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js
@@ -4,6 +4,12 @@ const wrong_url = "https://www.linkedincom";
 const correct_url = "https://www.linkedin.com";
 
 describe("edit documentation and link to dataset", () => {
+  beforeEach(() => {
+    cy.window().then((win) => {
+      win.localStorage.setItem("isThemeV2Enabled", "false");
+    });
+  });
+
   it("open test dataset page, edit documentation", () => {
     // edit documentation and verify changes saved
     cy.loginWithCredentials();
diff --git a/smoke-test/tests/cypress/cypress/e2e/ownership/manage_ownership.js b/smoke-test/tests/cypress/cypress/e2e/ownership/manage_ownership.js
index 17825881fb..2441363073 100644
--- a/smoke-test/tests/cypress/cypress/e2e/ownership/manage_ownership.js
+++ b/smoke-test/tests/cypress/cypress/e2e/ownership/manage_ownership.js
@@ -20,7 +20,9 @@ describe("manage ownership", () => {
 
     cy.get(
       '[data-row-key="Test Ownership Type"] > :nth-child(3) > .anticon > svg',
-    ).click();
+    )
+      .first()
+      .click();
     cy.clickOptionWithText("Edit");
     cy.get('[data-testid="ownership-type-description-input"]').clear(
       "This is an test ownership type description.",
@@ -34,7 +36,9 @@ describe("manage ownership", () => {
 
     cy.get(
       '[data-row-key="Test Ownership Type"] > :nth-child(3) > .anticon > svg',
-    ).click();
+    )
+      .first()
+      .click();
     cy.clickOptionWithText("Delete");
     cy.get(".ant-popover-buttons > .ant-btn-primary").click();
     cy.wait(3000);