diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 607e5abd..e439e0e1 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -192,12 +192,6 @@ http {
         return 302 /sso/login?next=ui.webmail;
       }
 
-      location ^~ {{ WEB_WEBMAIL }}/sso/ui/logout {
-        include /etc/nginx/proxy.conf;
-        rewrite ^{{ WEB_WEBMAIL }}/sso/ui/logout$ /sso/logout break;
-        proxy_pass http://$admin;
-      }
-
       location ^~ /ui/webmail {
         include /etc/nginx/proxy.conf;
         return 302 {{ WEB_WEBMAIL }};
diff --git a/webmails/rainloop/defaults/application.ini b/webmails/rainloop/defaults/application.ini
index 2e266235..d67ec9f0 100644
--- a/webmails/rainloop/defaults/application.ini
+++ b/webmails/rainloop/defaults/application.ini
@@ -9,7 +9,7 @@ allow_admin_panel = Off
 [labs]
 allow_gravatar = Off
 custom_login_link='sso.php'
-custom_logout_link='sso/ui/logout'
+custom_logout_link='/sso/logout'
 
 [contacts]
 enable = On
diff --git a/webmails/roundcube/config.inc.php b/webmails/roundcube/config.inc.php
index 3b474795..99f147fc 100644
--- a/webmails/roundcube/config.inc.php
+++ b/webmails/roundcube/config.inc.php
@@ -41,7 +41,7 @@ if (filter_var(getenv('ADMIN'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)
 }
 $config['product_name'] = 'Mailu Webmail';
 array_push($config['plugins'], 'mailu');
-$config['sso_logout_url'] = 'sso/ui/logout';
+$config['sso_logout_url'] = '/sso/logout';
 
 // We access the IMAP and SMTP servers locally with internal names, SSL
 // will obviously fail but this sounds better than allowing insecure login