diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
index 7ae9912..943cb44 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
@@ -351,6 +351,7 @@ public class TenantManagementService implements TenantProvider {
         applicationClient.setRedirectUris(tenantUserManagementProperties.getValidRedirectUris());
         applicationClient.setWebOrigins(List.of("+"));
         applicationClient.setPublicClient(true);
+        setPostLogoutRedirectUriForClient(applicationClient);
 
         var swaggerClient = new ClientRepresentation();
         swaggerClient.setEnabled(true);
@@ -364,9 +365,9 @@ public class TenantManagementService implements TenantProvider {
         swaggerClient.setAuthorizationServicesEnabled(true);
         swaggerClient.setRedirectUris(tenantUserManagementProperties.getValidRedirectUris());
         swaggerClient.setWebOrigins(List.of("+"));
+        setPostLogoutRedirectUriForClient(swaggerClient);
 
-        var clients = List.of(applicationClient, swaggerClient);
-        return clients;
+        return List.of(applicationClient, swaggerClient);
     }
 
 
@@ -385,6 +386,14 @@ public class TenantManagementService implements TenantProvider {
         }
     }
 
+    private void setPostLogoutRedirectUriForClient(ClientRepresentation client){
+        if(client.getAttributes() == null){
+            client.setAttributes(new HashMap<>());
+        }else{
+            client.setAttributes(new HashMap<>(client.getAttributes()));
+        }
+        client.getAttributes().put("post.logout.redirect.uris","*");
+    }
 
     private void setPasswordPolicyForRealm(String tenantId) {