diff --git a/activerecord/lib/active_record/attribute_set/builder.rb b/activerecord/lib/active_record/attribute_set/builder.rb
index 3946e02d10..54e9cbb779 100644
--- a/activerecord/lib/active_record/attribute_set/builder.rb
+++ b/activerecord/lib/active_record/attribute_set/builder.rb
@@ -65,7 +65,7 @@ module ActiveRecord
 
         if values.key?(name)
           hash[name] = Attribute.from_database(name, values[name], type)
-        elsif type
+        elsif types.key?(name)
           hash[name] = Attribute.uninitialized(name, type)
         end
       end
diff --git a/activerecord/test/cases/attribute_set_test.rb b/activerecord/test/cases/attribute_set_test.rb
index a531be482e..de63672963 100644
--- a/activerecord/test/cases/attribute_set_test.rb
+++ b/activerecord/test/cases/attribute_set_test.rb
@@ -109,7 +109,15 @@ module ActiveRecord
 
     test "fetch_value returns nil for unknown attributes" do
       attributes = attributes_with_uninitialized_key
-      assert_nil attributes.fetch_value(:wibble)
+      assert_nil attributes.fetch_value(:wibble) { "hello" }
+    end
+
+    test "fetch_value returns nil for unknown attributes when types has a default" do
+      types = Hash.new(Type::Value.new)
+      builder = AttributeSet::Builder.new(types)
+      attributes = builder.build_from_database
+
+      assert_nil attributes.fetch_value(:wibble) { "hello" }
     end
 
     test "fetch_value uses the given block for uninitialized attributes" do