diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 4183e973cfa..cc507ed6ea5 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -86,7 +86,7 @@ module FileStore
       return false if url.blank?
 
       begin
-        parsed_url = URI.parse(URI.encode(url))
+        parsed_url = URI.parse(UrlHelper.encode(url))
       rescue URI::InvalidURIError, URI::InvalidComponentError
         return false
       end