diff --git a/Gemfile b/Gemfile
index 3a46c92f9..bcdb47fe8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,7 +122,7 @@ group :development, :test do
 
 end
 
-gem 'puma'
+gem 'puma', '< 3.0'
 
 # load onw gem's
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
diff --git a/Gemfile.lock b/Gemfile.lock
index 6995975a7..c5cd62765 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,7 +48,7 @@ GEM
     biz (1.3.4)
       clavius (~> 1.0)
       tzinfo
-    browser (2.0.1)
+    browser (2.0.2)
     buftok (0.2.0)
     builder (3.2.2)
     childprocess (0.5.9)
@@ -199,7 +199,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (3.0.2)
+    puma (2.16.0)
     rack (1.6.4)
     rack-livereload (0.3.16)
       rack
@@ -352,7 +352,7 @@ DEPENDENCIES
   omniauth-linkedin
   omniauth-twitter
   pre-commit
-  puma
+  puma (< 3.0)
   rack-livereload
   rails (= 4.2.5.2)
   rails-observers