diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index fdaed5bfa29..c6f7c750358 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -331,8 +331,6 @@
 
 	nanomanager.send_resources(src)
 
-	media.update_music()
-
 	//////////////
 	//DISCONNECT//
 	//////////////
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index af177f73eb1..738e887b775 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -58,5 +58,3 @@
 
 	CallHook("Login", list("client" = src.client, "mob" = src))
 
-	update_music()
-
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 84456c68f2f..6c4230439ea 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -26,7 +26,9 @@
 	if(watch_locations.len>0)
 		loc = pick(watch_locations)
 */
-	update_music()
+
+	CallHook("Login", list("client" = src.client, "mob" = src))
+
 	new_player_panel()
 	spawn(40)
 		if(client)