diff --git a/Gemfile b/Gemfile
index f8f43b2a..0800f4ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 ruby "2.3.3"
 
 gem 'rails', '4.2.6'
-gem 'puma', '~> 2.15'
+gem 'puma', '~> 3.12'
 gem 'pg'
 
 # Auth
diff --git a/Gemfile.lock b/Gemfile.lock
index 54edd699..34fea8c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -250,7 +250,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.16.0)
+    puma (3.12.2)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)
@@ -441,7 +441,7 @@ DEPENDENCIES
   pg
   poltergeist (~> 1.8)
   pry-rails (~> 0.3.4)
-  puma (~> 2.15)
+  puma (~> 3.12)
   quiet_assets (~> 1.1)
   rack-mini-profiler (~> 0.9.8)
   rails (= 4.2.6)