diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index e5a15fbe08..e040540d46 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -374,7 +374,6 @@ export default class ElementWrapper extends Wrapper {
 			const statement = (b`
 				@detach(${node});
 				${node} = ${render_statement};
-				@validate_dynamic_element(${snippet});
 				${block.chunks.hydrate}
 				${block.event_listeners.length && b`${mounted}  = false`};
 				${staticChildren}
@@ -414,6 +413,11 @@ export default class ElementWrapper extends Wrapper {
 				if (renderer.options.hydratable) {
 					block.chunks.claim.push(b`@validate_dynamic_element(${snippet});`);
 				}
+				block.chunks.update.push(b`
+					if (${if_statement}) {
+						@validate_dynamic_element(${snippet});
+					}
+				`);
 			}
 		}
 	}