diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index f3faadf2e75..438f9d462c1 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -68,10 +68,6 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
 	return QDEL_HINT_HARDDEL_NOW
 
 /datum/controller/master/proc/Shutdown()
-	running = FALSE
-	//Give the loop thread some shutdown time
-	while(looping)
-		sleep(1)
 	for(var/datum/subsystem/ss in subsystems)
 		ss.Shutdown()
 	..()
diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
index 1119c791947..0a82e857ac3 100644
--- a/code/controllers/subsystem/tgui.dm
+++ b/code/controllers/subsystem/tgui.dm
@@ -18,9 +18,8 @@ var/datum/subsystem/tgui/SStgui
 
 	NEW_SS_GLOBAL(SStgui)
 
-/datum/subsystem/tgui/Destroy()
+/datum/subsystem/tgui/Shutdown()
 	close_all_uis()
-	return ..()
 
 /datum/subsystem/tgui/stat_entry()
 	..("P:[processing_uis.len]")