diff --git a/packages/ember-htmlbars/lib/keywords/collection.js b/packages/ember-htmlbars/lib/keywords/collection.js
index <HASH>..<HASH> 100644
--- a/packages/ember-htmlbars/lib/keywords/collection.js
+++ b/packages/ember-htmlbars/lib/keywords/collection.js
@@ -40,13 +40,13 @@ export default {
       };
     }
 
-    var componentNode = ComponentNode.create(node, env, hash, options, parentView, null, scope, template);
-    state.componentNode = componentNode;
-
     if (hash.itemView) {
       hash.itemViewClass = hash.itemView;
     }
 
+    var componentNode = ComponentNode.create(node, env, hash, options, parentView, null, scope, template);
+    state.componentNode = componentNode;
+
     componentNode.render(env, hash, visitor);
   }
 };
Munge attrs before creating ComponentNode