diff --git a/config/storage.yml b/config/storage.yml
index e2ad3bf9..20d32822 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -14,8 +14,10 @@ s3:
   secret_access_key: <%= ENV.fetch("AWS_SECRET_ACCESS_KEY") %>
   region: <%= ENV.fetch("AWS_REGION") %>
   bucket: <%= ENV.fetch("AWS_BUCKET") %>
+  <% if ENV['AWS_ENDPOINT'] %>
   endpoint: <%= ENV.fetch("AWS_ENDPOINT") %>
   force_path_style: true
+  <% end %>
 <% end %>
 
 # Remember not to checkin your GCS keyfile to a repository