diff --git a/src/app/services/authentication.service.ts b/src/app/services/authentication.service.ts
index b0496a904..0b0f93627 100755
--- a/src/app/services/authentication.service.ts
+++ b/src/app/services/authentication.service.ts
@@ -47,7 +47,7 @@ export class AuthenticationService {
     console.log(`${this.apiUrl}/openid_logout`);
 
     /*window.location.href = `${this.apiUrl}/openid_logout`;*/
-    window.location.href = `https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=${this.apiUrl}/openid_logout`;
+    window.location.href = `${environment.AAI_LOGOUT + window.location.origin + this.apiUrl}/openid_logout`;
   }
 
   public tryLogin() {
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index 9830fd9c9..bfd47e801 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
+  AAI_LOGOUT: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
   MATOMO_URL: 'https://analytics.openaire.eu/',
   MATOMO_SITE: 92,
   API_ENDPOINT: '/api',
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index c71ceed9f..4ebd13e5e 100755
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
+  AAI_LOGOUT: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
   MATOMO_URL: 'https://analytics.openaire.eu/',
   MATOMO_SITE: 111,
   API_ENDPOINT: '/api',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 3bbcd19c9..69451e65f 100755
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,6 +4,7 @@
 
 export const environment = {
   production: false,
+  AAI_LOGOUT: 'https://openaire-dev.aai-dev.grnet.gr/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
   API_ENDPOINT: '/uoa-repository-manager-service',
   MATOMO_URL: 'https://analytics.openaire.eu/',
   MATOMO_SITE: 9222222,