diff --git a/elements/x-design-host/x-design-host.html b/elements/x-design-host/x-design-host.html
index f8745133..aa0acb49 100644
--- a/elements/x-design-host/x-design-host.html
+++ b/elements/x-design-host/x-design-host.html
@@ -11,6 +11,12 @@
       this.treeInfo = {name: this.name, id: ''};
     },
 
+    marshalNodeReferences: function(root) {
+      this.super(arguments);
+      this.model = this.model || {};
+      this.model.$ = this.$;
+    },
+
     dumpTag: function(serializer, indent, tab) {
       var indented = indent + tab, attrs = '';
       var attrs = this.dumpAttributes();
@@ -69,7 +75,6 @@
           this.appendChild(template.createInstance(this.model));
           this.meta.ensureMeta(this);
           this.marshalNodeReferences(this);
-          this.model.$ = this.$;
           callback && callback();
         }.bind(this));
       } else if (callback) {