diff --git a/app/models/user.rb b/app/models/user.rb
index 261487230..9a432fc2e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -601,11 +601,11 @@ class User < Principal
   end
 
   def self.current=(user)
-    @current_user = user
+    Thread.current[:current_user] = user
   end
 
   def self.current
-    @current_user ||= User.anonymous
+    Thread.current[:current_user] ||= User.anonymous
   end
 
   # Returns the anonymous user.  If the anonymous user does not exist, it is created.  There can be only