diff --git a/lib/content-services/search/search-query-builder.service.spec.ts b/lib/content-services/search/search-query-builder.service.spec.ts
index 369ca8cee7..e18da7b4af 100644
--- a/lib/content-services/search/search-query-builder.service.spec.ts
+++ b/lib/content-services/search/search-query-builder.service.spec.ts
@@ -27,14 +27,6 @@ describe('SearchQueryBuilder', () => {
         return config;
     };
 
-    it('should throw error if configuration not provided', () => {
-        expect(() => {
-            const appConfig = new AppConfigService(null);
-            // tslint:disable-next-line:no-unused-expression
-            new SearchQueryBuilderService(appConfig, null);
-        }).toThrowError('Search configuration not found.');
-    });
-
     it('should use only enabled categories', () => {
         const config: SearchConfiguration = {
             categories: [
diff --git a/lib/content-services/search/search-query-builder.service.ts b/lib/content-services/search/search-query-builder.service.ts
index 5376efa090..8446cdca40 100644
--- a/lib/content-services/search/search-query-builder.service.ts
+++ b/lib/content-services/search/search-query-builder.service.ts
@@ -41,15 +41,11 @@ export class SearchQueryBuilderService {
 
     constructor(appConfig: AppConfigService,  private alfrescoApiService: AlfrescoApiService) {
         this.config = appConfig.get<SearchConfiguration>('search');
-        if (!this.config) {
-            throw new Error('Search configuration not found.');
-        }
 
-        if (this.config.categories) {
-            this.categories = this.config.categories.filter(f => f.enabled);
+        if (this.config) {
+            this.categories = (this.config.categories || []).filter(f => f.enabled);
+            this.filterQueries = this.config.filterQueries || [];
         }
-
-        this.filterQueries = this.config.filterQueries || [];
     }
 
     addFilterQuery(query: string): void {