diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 36375f50646..f9701f6b4b0 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -5762,10 +5762,8 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr,
         assert(dictptr != NULL);
         dict = *dictptr;
         if (dict == NULL) {
+            assert(!_PyType_HasFeature(tp, Py_TPFLAGS_MANAGED_DICT));
             dictkeys_incref(cached);
-            if (_PyType_HasFeature(tp, Py_TPFLAGS_MANAGED_DICT)) {
-                OBJECT_STAT_INC(dict_materialized_on_request);
-            }
             dict = new_dict_with_shared_keys(interp, cached);
             if (dict == NULL)
                 return -1;
diff --git a/Objects/object.c b/Objects/object.c
index d1154eb344f..868623a9f7b 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1577,6 +1577,14 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name,
                 goto error_check;
             }
             dictptr = &dorv_ptr->dict;
+            if (*dictptr == NULL) {
+                if (_PyObject_InitInlineValues(obj, tp) < 0) {
+                    goto done;
+                }
+                res = _PyObject_StoreInstanceAttribute(
+                    obj, _PyDictOrValues_GetValues(*dorv_ptr), name, value);
+                goto error_check;
+            }
         }
         else {
             dictptr = _PyObject_ComputedDictPointer(obj);