diff --git a/config.ru b/config.ru
index 73f9ca8ba..a49db71c6 100644
--- a/config.ru
+++ b/config.ru
@@ -8,6 +8,10 @@ require ::File.expand_path('../config/environment',  __FILE__)
 require ::File.expand_path('../lib/unicorn_killer',  __FILE__)
 require ::File.expand_path('../lib/rack/chrome_frame',  __FILE__)
 
+# Kill unicorn workers really agressively (at 300mb)
+if defined?(Unicorn)
+  use UnicornKiller::Oom, 300 * 1024
+end
 
 use Rack::ChromeFrame, :minimum => 8
 run Diaspora::Application