diff --git a/code/__defines/subsystem-priority.dm b/code/__defines/subsystem-priority.dm
index 5262dcccf41..8b5ea99a121 100644
--- a/code/__defines/subsystem-priority.dm
+++ b/code/__defines/subsystem-priority.dm
@@ -27,6 +27,7 @@
 #define SS_INIT_ZCOPY      -1	// Z-mimic flush. Should run after SSoverlay & SSicon_smooth so it copies the smoothed sprites.
 #define SS_INIT_LOBBY      -2	// Lobby timer starts here. The lobby timer won't actually start going down until the MC starts ticking, so you probably want this last
 #define SS_INIT_CHAT       -3	// To ensure chat remains smooth during init.
+#define SS_INIT_XENOARCH   -4   // Xenoarch is this far below because it can infinite loop if placed in SS_INIT_MISC as it was before, due to some subsystems spawning stuff there.
 
 // Something to remember when setting priorities: SS_TICKER runs before Normal, which runs before SS_BACKGROUND.
 // Each group has its own priority bracket.
diff --git a/code/controllers/subsystems/initialization/xenoarch.dm b/code/controllers/subsystems/initialization/xenoarch.dm
index a62183ab5d7..bb244a0e4f3 100644
--- a/code/controllers/subsystems/initialization/xenoarch.dm
+++ b/code/controllers/subsystems/initialization/xenoarch.dm
@@ -9,7 +9,7 @@ var/datum/controller/subsystem/xenoarch/SSxenoarch
 /datum/controller/subsystem/xenoarch
 	name = "Xenoarcheology"
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_MISC
+	init_order = SS_INIT_XENOARCH
 
 	var/list/artifact_spawning_turfs = list()
 	var/list/digsite_spawning_turfs = list()
diff --git a/html/changelogs/mattatlas-thenothingivebecome.yml b/html/changelogs/mattatlas-thenothingivebecome.yml
new file mode 100644
index 00000000000..693576e196b
--- /dev/null
+++ b/html/changelogs/mattatlas-thenothingivebecome.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - backend: "The Xenoarch subsystem no longer enters into a potential infinite loop."