diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index 0848b45c2..bfb1b6d2e 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -399,17 +399,21 @@ module Fog
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
+
+          @region = options[:region] || DEFAULT_REGION
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
             @scheme = endpoint.scheme
             @port = endpoint.port
           else
-            @region     = options[:region]      || DEFAULT_REGION
             @host       = options[:host]        || region_to_host(@region)
             @scheme     = options[:scheme]      || DEFAULT_SCHEME
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
           end
+
+
           @path_style = options[:path_style] || false
           @signature_version = options.fetch(:aws_signature_version, 4)
           validate_signature_version!
@@ -471,13 +475,14 @@ module Fog
           validate_signature_version!
           @path_style = options[:path_style]  || false
 
+          @region = options[:region] || DEFAULT_REGION
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
             @scheme = endpoint.scheme
             @port = endpoint.port
           else
-            @region     = options[:region]      || DEFAULT_REGION
             @host       = options[:host]        || region_to_host(@region)
             @scheme     = options[:scheme]      || DEFAULT_SCHEME
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]