diff --git a/Gemfile b/Gemfile
index 12875675e50..12d17e48c71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,7 +81,7 @@ gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'paper_trail', '~> 7.1.3'
-gem 'paperclip', '~> 3.4.1'
+gem 'paperclip', '> 3.4', '< 4.0'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
 gem 'roadie-rails', '~> 1.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3954e76993b..eed6424b5ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -317,11 +317,10 @@ GEM
     paper_trail (7.1.3)
       activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
-    paperclip (3.4.2)
+    paperclip (3.5.4)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
     parallel (1.20.1)
     paranoia (2.4.3)
@@ -625,7 +624,7 @@ DEPENDENCIES
   ofn-qz!
   order_management!
   paper_trail (~> 7.1.3)
-  paperclip (~> 3.4.1)
+  paperclip (> 3.4, < 4.0)
   paranoia (~> 2.4)
   pg (~> 0.21.0)
   pry