diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm
index dde35a9f75..0141a4baee 100644
--- a/code/modules/instruments/instruments/item.dm
+++ b/code/modules/instruments/instruments/item.dm
@@ -69,7 +69,7 @@
 /obj/item/instrument/dropped(mob/user)
 	. = ..()
 	if((loc != user) && (user.machine == src))
-		user.set_machine(null)
+		user.unset_machine()
 
 /obj/item/instrument/interact(mob/user)
 	ui_interact(user)
diff --git a/code/modules/instruments/instruments/stationary.dm b/code/modules/instruments/instruments/stationary.dm
index f236927c38..f54132984f 100644
--- a/code/modules/instruments/instruments/stationary.dm
+++ b/code/modules/instruments/instruments/stationary.dm
@@ -24,6 +24,7 @@
 
 /obj/structure/musician/ui_interact(mob/user)
 	. = ..()
+	user.set_machine(src)
 	song.ui_interact(user)
 
 /obj/structure/musician/wrench_act(mob/living/user, obj/item/I)
diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm
index 0fb4418a30..463398d2f2 100644
--- a/code/modules/instruments/songs/_song.dm
+++ b/code/modules/instruments/songs/_song.dm
@@ -223,8 +223,6 @@
 
 /// Updates the window for our user. Override in subtypes.
 /datum/song/proc/updateDialog(mob/user = usr)
-	if(user.machine != src)
-		return
 	ui_interact(user)
 
 /datum/song/process(wait)