diff --git a/src/main/java/org/caosdb/server/CaosDBServer.java b/src/main/java/org/caosdb/server/CaosDBServer.java
index 091d417320dccfa944a772e4ec15ddf830009f52..b445749d68fafaeac74cc398912769acd6841a8b 100644
--- a/src/main/java/org/caosdb/server/CaosDBServer.java
+++ b/src/main/java/org/caosdb/server/CaosDBServer.java
@@ -568,9 +568,9 @@ public class CaosDBServer extends Application {
               setSessionCookies(response);
 
             } finally {
-              // remove subject from this thread so that we can reuse the
-              // thread.
-              ThreadContext.unbindSubject();
+              // remove subject and all other session data from this thread so
+              // that we can reuse the thread.
+              ThreadContext.remove();
             }
           }