diff --git a/comanage-registry-shibboleth-sp/000-comanage.conf b/comanage-registry-shibboleth-sp/000-comanage.conf
index 9004131..26310a6 100644
--- a/comanage-registry-shibboleth-sp/000-comanage.conf
+++ b/comanage-registry-shibboleth-sp/000-comanage.conf
@@ -68,4 +68,8 @@
     Require shibboleth
   </Location>
 
+  RewriteEngine On
+  RewriteCond %{QUERY_STRING} !after_redirect
+  RewriteRule ^/registry/auth/logout.* https://%%SERVER_NAME%%/Shibboleth.sso/Logout?return=https://%%SERVER_NAME%%/registry/auth/logout/?after_redirect [L,R]
+
 </VirtualHost>