diff --git a/Gemfile b/Gemfile
index 1b50160f7..3aed53724 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,9 +52,8 @@ else
   gem 'active_attr'
 end
 
-gem 'redis'
 gem 'hiredis'
-gem 'em-redis'
+gem 'redis', :require => ["redis", "redis/connection/hiredis"]
 
 gem 'active_model_serializers'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b269e468..a01605169 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -161,8 +161,6 @@ GEM
     debug_inspector (0.0.2)
     diff-lcs (1.2.4)
     diffy (3.0.1)
-    em-redis (0.3.0)
-      eventmachine
     ember-rails (0.10.0)
       active_model_serializers
       barber
@@ -464,7 +462,6 @@ DEPENDENCIES
   diffy (>= 3.0)
   discourse_emoji!
   discourse_plugin!
-  em-redis
   email_reply_parser!
   ember-rails
   ember-source (= 1.0.0.rc6.2)
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 04686d902..1d123c876 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -193,8 +193,6 @@ GEM
     debug_inspector (0.0.2)
     diff-lcs (1.2.4)
     diffy (3.0.1)
-    em-redis (0.3.0)
-      eventmachine
     ember-data-source (0.13)
       ember-source
     ember-rails (0.13.0)
@@ -474,7 +472,6 @@ DEPENDENCIES
   diffy (>= 3.0)
   discourse_emoji!
   discourse_plugin!
-  em-redis
   email_reply_parser!
   ember-rails
   ember-source (= 1.0.0.rc6.2)