diff --git a/modules/core/src/compiler/view.js b/modules/core/src/compiler/view.js
index c566b75560..34d79091e0 100644
--- a/modules/core/src/compiler/view.js
+++ b/modules/core/src/compiler/view.js
@@ -156,13 +156,10 @@ export class View {
         elementInjector.instantiateDirectives(appInjector, shadowDomAppInjector, this.preBuiltObjects[i]);
       }
 
-      // componentChildViews
-      if (isPresent(shadowDomAppInjector)) {
+      if (isPresent(componentDirective)) {
         this.componentChildViews[componentChildViewIndex++].hydrate(shadowDomAppInjector,
           elementInjector, elementInjector.getComponent());
-      }
 
-      if (isPresent(componentDirective)) {
         var lightDom = this.preBuiltObjects[i].lightDom;
         if (isPresent(lightDom)) lightDom.redistribute();
       }