diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
new file mode 100644
index 00000000000..97a4079d9b8
--- /dev/null
+++ b/config/initializers/paperclip.rb
@@ -0,0 +1,13 @@
+class Paperclip::UrlGenerator
+  private
+
+    # Code copied from the paperclip gem, only replacing
+    # `URI.escape` with `URI::DEFAULT_PARSER.escape`
+    def escape_url(url)
+      if url.respond_to?(:escape)
+        url.escape
+      else
+        URI::DEFAULT_PARSER.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
+      end
+    end
+end