diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 71a7b514ec9a27884685ec4c9f8cdb9349af5fd5..580a3196e6f5b3b4fc0b33d99ea400a9aa0e2085 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -2,6 +2,11 @@
 
 Paperclip.options[:read_timeout] = 60
 
+Paperclip.interpolates :filename do |attachment, style|
+  return attachment.original_filename if style == :original
+  [basename(attachment, style), extension(attachment, style)].delete_if(&:empty?).join('.')
+end
+
 if ENV['S3_ENABLED'] == 'true'
   Aws.eager_autoload!(services: %w(S3))