diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index 5ccebc0cb5..a7fda0ba29 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -618,7 +618,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 		let keep_selection = false;
 
 		// Avoid loops cause by change events
-		if(this.update_in_progress) return;
+		if(this.update_in_progress || !this.controller) return;
 		this.update_in_progress = true;
 
 		// Cleared explicitly