diff --git a/src/instance/base.js b/src/instance/base.js
index cff2df9..7aa72c9 100644
--- a/src/instance/base.js
+++ b/src/instance/base.js
@@ -33,9 +33,9 @@
       this.prepareElement();
       // TODO(sorvell): replace when ShadowDOMPolyfill issue is corrected
       // https://github.com/Polymer/ShadowDOM/issues/420
-      //if (!this.ownerDocument.isStagingDocument) {
+      if (!this.ownerDocument.isStagingDocument || window.ShadowDOMPolyfill) {
         this.makeElementReady();
-      //}
+      }
     },
     // system entry point, do not override
     prepareElement: function() {