diff --git a/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts b/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
index 42570e9a90..f07dc1d442 100644
--- a/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
+++ b/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
@@ -409,6 +409,11 @@ export class et2_nextmatch_rowProvider
 					}
 				}
 			}
+			else
+			{
+				// Need to include all webComponents or they lose their event handlers in the clone
+				hasAttr = true;
+			}
 
 			// Add the entry if there is any data in it
 			if(hasAttr)