diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/storage/aws.rb
+++ b/lib/fog/storage/aws.rb
@@ -66,8 +66,10 @@ module Fog
           params[:headers]['Date'] = expires.to_i
           params[:path] = Fog::AWS.escape(params[:path]).gsub('%2F', '/')
           query = []
-          for key, value in params[:query]
-            query << "#{key}=#{Fog::AWS.escape(value)}"
+          if params[:query]
+            for key, value in params[:query]
+              query << "#{key}=#{Fog::AWS.escape(value)}"
+            end
           end
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{Fog::AWS.escape(signature(params))}"
[storage|aws] fix url to check for query