diff --git a/Gemfile b/Gemfile
index 38038af0c4..79ac8498fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'gettext_i18n_rails', '~> 1.0'
 gem 'guard-jasmine', '~> 1.19', :group => [:test, :development]
 gem 'haml', '~> 3.1'
 gem 'haml_assets', '~> 0.2'
-gem 'jquery-rails', '~> 2.3' # NOTE in order to upgrate to '~> 3.1', first adapt the code removing the .live() functions
+gem 'jquery-rails', '2.1.3' # '~> 2.1' FIXME the version 2.1.4 clashes with underscore-rails 1.4.2.1 + # NOTE in order to upgrate to '~> 3.1', first adapt the code removing the .live() functions
 gem 'jquery-tmpl-rails', '~> 1.1'
 gem 'jruby-openssl', :platform => :jruby
 gem 'json', '~> 1.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index a6676fbc4c..9a5915143c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,9 +173,9 @@ GEM
     highline (1.6.21)
     hike (1.2.3)
     i18n (0.6.9)
-    jquery-rails (2.3.0)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
     jquery-tmpl-rails (1.1.0)
       rails (>= 3.1.0)
     json (1.8.1)
@@ -385,7 +385,7 @@ DEPENDENCIES
   haml (~> 3.1)
   haml_assets (~> 0.2)
   jasminerice!
-  jquery-rails (~> 2.3)
+  jquery-rails (= 2.1.3)
   jquery-tmpl-rails (~> 1.1)
   jruby-openssl
   json (~> 1.8)