diff --git a/modules/angular2/src/core/linker/element.ts b/modules/angular2/src/core/linker/element.ts
index b61ea3a231..42b716e999 100644
--- a/modules/angular2/src/core/linker/element.ts
+++ b/modules/angular2/src/core/linker/element.ts
@@ -463,7 +463,7 @@ export class AppElement implements DependencyProvider, ElementRef, AfterViewChec
     var inj: AppElement = this;
     while (isPresent(inj)) {
       inj._setQueriesAsDirty();
-      if (isBlank(inj.parent) && isPresent(inj.parentView.containerAppElement)) {
+      if (isBlank(inj.parent) && inj.parentView.proto.type === ViewType.EMBEDDED) {
         inj = inj.parentView.containerAppElement;
       } else {
         inj = inj.parent;