diff --git a/frameworks/Ruby/padrino/app/controllers.rb b/frameworks/Ruby/padrino/app/controllers.rb
index c2a3291d797..e5a200c7f2c 100644
--- a/frameworks/Ruby/padrino/app/controllers.rb
+++ b/frameworks/Ruby/padrino/app/controllers.rb
@@ -7,10 +7,6 @@
     response['Server'] = 'padrino'
   end
 
-  after do
-    response['Date'] = Time.now.httpdate
-  end if defined?(Puma)
-
   get '/json', :provides => [:json] do
     {message: "Hello, World!"}.to_json
   end
diff --git a/frameworks/Ruby/padrino/config/database.rb b/frameworks/Ruby/padrino/config/database.rb
index 06324898cd9..c4bf9d564d2 100644
--- a/frameworks/Ruby/padrino/config/database.rb
+++ b/frameworks/Ruby/padrino/config/database.rb
@@ -8,14 +8,9 @@
 }
 
 # Determine threading/thread pool size and timeout
-if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
-  opts[:pool] = threads
-  opts[:checkout_timeout] = 10
-else
-  # TODO: ActiveRecord doesn't have a single-threaded mode?
-  opts[:pool] = 1
-  opts[:checkout_timeout] = 0
-end
+# TODO: ActiveRecord doesn't have a single-threaded mode?
+opts[:pool] = 512
+opts[:checkout_timeout] = 5
 
 
 # Setup our logger