diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index a9807a599c..bf4f562f36 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -49,7 +49,6 @@ GLOBAL_PROTECT(config_dir)
 		if(initial(E.abstract_type) == I)
 			continue
 		E = new I
-		_entries_by_type[I] = E
 		var/esname = E.name
 		var/datum/config_entry/test = _entries[esname]
 		if(test)
@@ -57,6 +56,7 @@ GLOBAL_PROTECT(config_dir)
 			qdel(E)
 			continue
 		_entries[esname] = E
+		_entries_by_type[I] = E
 		.[E.resident_file] = TRUE
 
 /datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)