diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index 4bf38b2d5a87dd677d190400599ff40a7baa5c26..10008f05bfbf6fa880f1e6357bd6805911028c92 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -81,9 +81,14 @@ export class AuthService {
     } catch (error) {
     }
 
-    const url = `${env.logoutEndpoint}?id_token=${idToken}&identity_provider=${identityProvider}`;
+    if (idToken !== null && identityProvider !== null) {
+      const url = `${env.logoutEndpoint}?id_token=${idToken}&identity_provider=${identityProvider}`;
+
+      window.location.href = url;
+    } else {
+      this.resetAuth();
+    }
 
-    window.location.href = url;
   }
 
   resetAuth() {
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index eec3395235e20832dfae8f720c7a81b5a32c1a49..063e332290afce64dbdd230901bd4032a7fb31d3 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -16,7 +16,7 @@ export const environment = {
 
   // ElasticSearch
   elasticsearchUrl: {
-    full: kongBaseUrl + '/elasticsearch-dev/test-all-in-one-index.full.v9.quadtree',
+    full: kongBaseUrl + '/elasticsearch/test-all-in-one-index.full.v9.quadtree',
   },
 
   enableEsFrontCache: false,
diff --git a/src/environments/environment.rec.ts b/src/environments/environment.rec.ts
index 45774368287308e9fb964268737e093d3919cc4a..a00aea3bd1785bf00d190814a6fc5a18b96f493a 100644
--- a/src/environments/environment.rec.ts
+++ b/src/environments/environment.rec.ts
@@ -16,7 +16,7 @@ export const environment = {
 
   // ElasticSearch
   elasticsearchUrl: {
-    full: kongBaseUrl + '/elasticsearch-rec/test-all-in-one-index.full.v9.quadtree',
+    full: kongBaseUrl + '/elasticsearch/test-all-in-one-index.full.v9.quadtree',
   },
 
   enableEsFrontCache: false,