diff --git a/namespace.c b/namespace.c
index c8c947f50cd8ba..86a5ecf1544907 100644
--- a/namespace.c
+++ b/namespace.c
@@ -208,7 +208,7 @@ free_loading_table_entry(st_data_t key, st_data_t value, st_data_t arg)
 }
 
 static void
-namespace_entry_free(void *ptr)
+namespace_root_free(void *ptr)
 {
     rb_namespace_t *ns = (rb_namespace_t *)ptr;
     if (ns->loading_table) {
@@ -216,6 +216,17 @@ namespace_entry_free(void *ptr)
         st_free_table(ns->loading_table);
         ns->loading_table = 0;
     }
+
+    if (ns->loaded_features_index) {
+        st_free_table(ns->loaded_features_index);
+    }
+}
+
+static void
+namespace_entry_free(void *ptr)
+{
+    namespace_root_free(ptr);
+    xfree(ptr);
 }
 
 static size_t
@@ -238,6 +249,17 @@ const rb_data_type_t rb_namespace_data_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY // TODO: enable RUBY_TYPED_WB_PROTECTED when inserting write barriers
 };
 
+const rb_data_type_t rb_root_namespace_data_type = {
+    "Namespace::Root",
+    {
+        rb_namespace_entry_mark,
+        namespace_root_free,
+        namespace_entry_memsize,
+        rb_namespace_gc_update_references,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY // TODO: enable RUBY_TYPED_WB_PROTECTED when inserting write barriers
+};
+
 VALUE
 rb_namespace_entry_alloc(VALUE klass)
 {
@@ -708,7 +730,7 @@ initialize_root_namespace(void)
         root->ns_id = namespace_generate_id();
         root->ns_object = root_namespace;
 
-        entry = TypedData_Wrap_Struct(rb_cNamespaceEntry, &rb_namespace_data_type, root);
+        entry = TypedData_Wrap_Struct(rb_cNamespaceEntry, &rb_root_namespace_data_type, root);
         rb_ivar_set(root_namespace, id_namespace_entry, entry);
     }
     else {