diff --git a/Gemfile b/Gemfile
index f33d4431..0ebbc66c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ gem "decidim-verifications-members_picker", git: "https://github.com/gencat/deci
 gem "soda-ruby", require: false
 
 gem "puma"
+gem "puma_worker_killer"
 
 gem "figaro", ">= 1.1.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d0a61770..ba9d5577 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -512,6 +512,8 @@ GEM
       activesupport (>= 4.1, < 7.1)
       railties (>= 4.1, < 7.1)
     geocoder (1.7.5)
+    get_process_mem (0.2.7)
+      ffi (~> 1.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
     graphql (1.12.24)
@@ -678,6 +680,9 @@ GEM
     public_suffix (5.0.3)
     puma (5.6.7)
       nio4r (~> 2.0)
+    puma_worker_killer (0.3.1)
+      get_process_mem (~> 0.2)
+      puma (>= 2.7)
     racc (1.7.1)
     rack (2.2.8)
     rack-attack (6.7.0)
@@ -936,6 +941,7 @@ DEPENDENCIES
   letter_opener_web
   listen
   puma
+  puma_worker_killer
   recaptcha
   rspec-rails
   rubocop-faker
@@ -949,4 +955,4 @@ RUBY VERSION
    ruby 2.7.5p203
 
 BUNDLED WITH
-   2.3.4
+   2.3.6