diff --git a/lib/core/src/lib/api-factories/alfresco-api-v2-loader.service.ts b/lib/core/src/lib/api-factories/alfresco-api-v2-loader.service.ts
index 67336f244f..a2a3d94b68 100644
--- a/lib/core/src/lib/api-factories/alfresco-api-v2-loader.service.ts
+++ b/lib/core/src/lib/api-factories/alfresco-api-v2-loader.service.ts
@@ -36,7 +36,7 @@ export class AlfrescoApiLoaderService {
         return this.initAngularAlfrescoApi();
     }
 
-    private initAngularAlfrescoApi() {
+    private async initAngularAlfrescoApi() {
         const oauth: OauthConfigModel = Object.assign({}, this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null));
 
         if (oauth) {
@@ -57,6 +57,6 @@ export class AlfrescoApiLoaderService {
             oauth2: oauth
         });
 
-        this.apiService.load(config);
+        await this.apiService.load(config);
     }
 }
diff --git a/lib/core/src/lib/services/alfresco-api.service.ts b/lib/core/src/lib/services/alfresco-api.service.ts
index 81eb92fe4b..f1524f41ad 100644
--- a/lib/core/src/lib/services/alfresco-api.service.ts
+++ b/lib/core/src/lib/services/alfresco-api.service.ts
@@ -49,7 +49,7 @@ export class AlfrescoApiService {
         this.currentAppConfig = config;
 
         if (config.authType === 'OAUTH') {
-                this.mapAlfrescoApiOpenIdConfig();
+                await this.mapAlfrescoApiOpenIdConfig();
         }
 
         this.initAlfrescoApiWithConfig();
@@ -59,7 +59,7 @@ export class AlfrescoApiService {
     async reset() {
         this.getCurrentAppConfig();
         if (this.currentAppConfig.authType === 'OAUTH') {
-            this.mapAlfrescoApiOpenIdConfig();
+            await this.mapAlfrescoApiOpenIdConfig();
         }
         this.initAlfrescoApiWithConfig();
     }