diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2435165f..565187c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 
 ## Upcoming Changes
 
+* Fixed a deadlock in Wiring (@Wolfje)
 * Fixed character styles/gender not being saved properly on first login while SSC is on (@WhiteXZ)
 * Added a PlayerPermission hook fired whenever a permission check involving said player occurs (when the new TSPlayer.HasPermission method is called) (@Enerdy)
 * Resolved an issue where martian invasions and eclipses would have empty messages if AnonymousBossInvasions was set to true (@WhiteXZ)
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index a856a014..01d10464 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit a856a0148bb86ea9048aa8d433faa72a10ed60f3
+Subproject commit 01d10464c542a1445336d123443619155cf9a4d3