Merge branch 'release/2.1.0' into develop

1 files changed, 5 insertions, 2 deletions

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index c0e1f08bb..e015d0e14 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -168,8 +168,11 @@ export class ServerService {
     if (!this.configObservable) {
       this.configObservable = this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
                                   .pipe(
-                                    tap(this.saveConfigLocally),
-                                    tap(() => this.configLoaded = true),
+                                    tap(config => this.saveConfigLocally(config)),
+                                    tap(config => {
+                                      this.config = config
+                                      this.configLoaded = true
+                                    }),
                                     tap(() => {
                                       if (this.configReset) {
                                         this.configReloaded.next()