diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index d81f682fff..1cf772869a 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -2246,6 +2246,7 @@
         if (this.__templateInfoLast == templateInfo) {
           this.__templateInfoLast = templateInfo.previousTemplateInfo;
         }
+        templateInfo.previousTemplateInfo = templateInfo.nextTemplateInfo = null;
         // Remove stamped nodes
         let nodes = templateInfo.childNodes;
         for (let i=0; i<nodes.length; i++) {