diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index c6f7c750358..fdaed5bfa29 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -331,6 +331,8 @@
 
 	nanomanager.send_resources(src)
 
+	media.update_music()
+
 	//////////////
 	//DISCONNECT//
 	//////////////
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 7968e864324..af177f73eb1 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -56,8 +56,7 @@
 		if(H.species && H.species.abilities)
 			client.verbs |= H.species.abilities
 
-	update_music()
-
 	CallHook("Login", list("client" = src.client, "mob" = src))
 
+	update_music()