diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index e881423e485..bff50419ee2 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -34,6 +34,9 @@
 			oct++
 		note++
 		acc = "n"
+	else if(acc == "#" && (note == 7)) //G#
+		note = 1
+		acc = "b"
 	else if(acc == "#") // mass convert all sharps to flats, octave jump already handled
 		acc = "b"
 		note++