diff --git a/src/components/block/index.ts b/src/components/block/index.ts
index 598ae759..7eee3163 100644
--- a/src/components/block/index.ts
+++ b/src/components/block/index.ts
@@ -911,7 +911,7 @@ export default class Block extends EventsDispatcher<BlockEvents> {
             return false;
           }
 
-          return (node as HTMLElement).dataset.mutationFree === 'true' || !!node.closest('[data-mutation-free="deep"]');
+          return !!node.closest('[data-mutation-free="true"]');
         });
       });
 
diff --git a/test/cypress/tests/onchange.cy.ts b/test/cypress/tests/onchange.cy.ts
index 210f337a..be601084 100644
--- a/test/cypress/tests/onchange.cy.ts
+++ b/test/cypress/tests/onchange.cy.ts
@@ -454,7 +454,7 @@ describe('onChange callback', () => {
       .get('div.ce-block')
       .click();
 
-    cy.wait(500).then(() => {
+    cy.wait(200).then(() => {
       cy.get('@onChange').should('have.callCount', 0);
     });
   });
@@ -539,7 +539,7 @@ describe('onChange callback', () => {
     /**
      * Check that onChange callback was not called
      */
-    cy.wait(500).then(() => {
+    cy.wait(200).then(() => {
       cy.get('@onChange').should('have.callCount', 0);
     });
   });
@@ -554,9 +554,9 @@ describe('onChange callback', () => {
     toolWrapper.appendChild(toolChild);
 
     /**
-     * Mark it as mutation-free with deep check
+     * Mark it as mutation-free
      */
-    toolWrapper.dataset.mutationFree = 'deep';
+    toolWrapper.dataset.mutationFree = 'true';
 
     /**
      * Mock of tool with data-mutation-free attribute
@@ -606,7 +606,7 @@ describe('onChange callback', () => {
     /**
      * Check that onChange callback was not called
      */
-    cy.wait(500).then(() => {
+    cy.wait(200).then(() => {
       cy.get('@onChange').should('have.callCount', 0);
     });
   });