diff --git a/webapp/packages/core-root/src/SessionResource.ts b/webapp/packages/core-root/src/SessionResource.ts
index ba8d504058..7998b40ee3 100644
--- a/webapp/packages/core-root/src/SessionResource.ts
+++ b/webapp/packages/core-root/src/SessionResource.ts
@@ -74,7 +74,8 @@ export class SessionResource extends CachedDataResource<SessionState | null> {
 
   async changeLanguage(locale: string): Promise<void> {
     await this.load();
-    if (this.data?.locale === locale) {
+    //TODO we check "!locale" because of the bug described in CB-6048, should be removed when fixed
+    if (this.data?.locale === locale || !locale) {
       return;
     }
     await this.graphQLService.sdk.changeSessionLanguage({ locale });