diff --git a/lib/paperclip/storage.rb b/lib/paperclip/storage.rb
index 7c7d88c..1419ff3 100644
--- a/lib/paperclip/storage.rb
+++ b/lib/paperclip/storage.rb
@@ -166,6 +166,7 @@ module Paperclip
         return @aws_bucket if @aws_bucket
 
         s3_client = Aws::S3::Client.new(
+          endpoint: @s3_credentials[:endpoint],
           region:            @s3_credentials[:region] || 'us-east-1',
           access_key_id:     @s3_credentials[:access_key_id],
           secret_access_key: @s3_credentials[:secret_access_key]