diff --git a/Gemfile b/Gemfile
index 0c53e73a3de..69f2f87d98d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,6 +39,8 @@ gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18]
 gem 'globalize3', :git => 'https://github.com/svenfuchs/globalize3.git'
 gem "delayed_job_active_record" # that's how delayed job's readme recommends it
 
+gem 'request_store'
+
 # TODO: adds #auto_link which was deprecated in rails 3.1
 gem 'rails_autolink'
 gem "will_paginate", '~> 3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 684c837cfac..47800ae12b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,6 +262,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
+    request_store (1.0.5)
     rmagick (2.13.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -408,6 +409,7 @@ DEPENDENCIES
   rb-fsevent
   rb-readline
   rdoc (>= 2.4.2)
+  request_store
   rmagick (>= 1.15.17)
   rspec (~> 2.0)
   rspec-example_disabler
diff --git a/config/application.rb b/config/application.rb
index 678ec53915e..8cbe443552a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -86,11 +86,6 @@ module OpenProject
     # automatically compile translations.js
     config.middleware.use I18n::JS::Middleware
 
-    # add the request-store to the middleware to make sure, that thread-loca variables are
-    # cleaned up after the request
-    require "request_store/middleware"
-    config.middleware.use RequestStore::Middleware
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"