diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
index a55b8a84dd..ebdf6036d5 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
@@ -82,7 +82,9 @@ export class AlfrescoSearchControlComponent implements AfterViewInit {
     }
 
     ngAfterViewInit() {
-        componentHandler.upgradeAllRegistered();
+        if (componentHandler) {
+            componentHandler.upgradeAllRegistered();
+        }
     }
 
     getTextFieldClassName(): string {