diff --git a/Gemfile b/Gemfile
index 64b5947ba..05edb8eca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ gem 'client_side_validations'
 
 gem 'faraday'
 gem 'faraday-stack'
-gem 'em-synchrony', :platforms => :ruby_19
+gem 'em-synchrony', '1.0.0', :platforms => :ruby_19
 
 # jazzy jasmine
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e7967e1a..287e65f87 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,12 +145,12 @@ GEM
       addressable (>= 2.0.0)
       escape_utils
       eventmachine (>= 0.12.9)
-    em-synchrony (0.2.0)
-      eventmachine (>= 0.12.9)
+    em-synchrony (1.0.0)
+      eventmachine (>= 1.0.0.beta.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     escape_utils (0.2.4)
-    eventmachine (0.12.10)
+    eventmachine (1.0.0.beta.4)
     excon (0.9.6)
     factory_girl (2.6.3)
       activesupport (>= 2.3.9)
@@ -462,7 +462,7 @@ DEPENDENCIES
   devise (~> 1.3.1)
   devise_invitable (= 0.5.0)
   diaspora-client!
-  em-synchrony
+  em-synchrony (= 1.0.0)
   factory_girl_rails
   faraday
   faraday-stack