diff --git a/src/heap/factory.cc b/src/heap/factory.cc
index c8f885af1f..19f0ea3166 100644
--- a/src/heap/factory.cc
+++ b/src/heap/factory.cc
@@ -2086,6 +2086,7 @@ Map Factory::InitializeMap(Map map, InstanceType type, int instance_size,
   map.SetInstanceDescriptors(isolate(), ro_roots.empty_descriptor_array(), 0);
   // Must be called only after |instance_type| and |instance_size| are set.
   map.set_visitor_id(Map::GetVisitorId(map));
+  map.set_cached_property_handler(*undefined_value());
   DCHECK(!map.is_in_retained_map_list());
   map.clear_padding();
   map.set_elements_kind(elements_kind);
diff --git a/src/objects/map.tq b/src/objects/map.tq
index 1082ab7bf5..5d7a42608d 100644
--- a/src/objects/map.tq
+++ b/src/objects/map.tq
@@ -69,7 +69,6 @@ extern class Map extends HeapObject {
   @ifnot(TAGGED_SIZE_8_BYTES) optional_padding: void;
 
   cached_property_handler: InterceptorInfo|Undefined;
-  pad: Undefined;
 
   prototype: JSReceiver|Null;
   constructor_or_back_pointer_or_native_context: Object;