diff --git a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
index 1b8457c60..b99227d1b 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
@@ -29,9 +29,7 @@ module Fog
         def delete_bucket_tagging(bucket_name)
           response = Excon::Response.new
           if self.data[:buckets][bucket_name]
-            if self.data[:bucket_tagging]
-              self.data[:bucket_tagging].delete(bucket_name)
-            end
+            self.data[:bucket_tagging].delete(bucket_name)
             response.status = 204
           else
             response.status = 404
diff --git a/lib/fog/aws/requests/storage/get_bucket_tagging.rb b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
index b5cafdc3d..f840785f3 100644
--- a/lib/fog/aws/requests/storage/get_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
@@ -37,7 +37,7 @@ module Fog
 
         def get_bucket_tagging(bucket_name)
           response = Excon::Response.new
-          if self.data[:buckets][bucket_name] && self.data[:bucket_tagging] && self.data[:bucket_tagging][bucket_name]
+          if self.data[:buckets][bucket_name] && self.data[:bucket_tagging][bucket_name]
             response.status = 200
             response.body = {'BucketTagging' => self.data[:bucket_tagging][bucket_name]}
           else
diff --git a/lib/fog/aws/requests/storage/put_bucket_tagging.rb b/lib/fog/aws/requests/storage/put_bucket_tagging.rb
index 6714903a3..1e63c32d2 100644
--- a/lib/fog/aws/requests/storage/put_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_tagging.rb
@@ -43,7 +43,6 @@ DATA
           response = Excon::Response.new
 
           if self.data[:buckets][bucket_name]
-            self.data[:bucket_tagging] ||= {}
             self.data[:bucket_tagging][bucket_name] = tags
             response.status = 204
           else
diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index d4094b399..087c71eee 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -336,7 +336,8 @@ module Fog
                 :buckets => {},
                 :cors => {
                   :bucket => {}
-                }
+                },
+                :bucket_tagging => {}
               }
             end
           end