diff --git a/src/game/behaviors/yoshi.inc.c b/src/game/behaviors/yoshi.inc.c
index 65f2cf3b1..5fe9bff1d 100644
--- a/src/game/behaviors/yoshi.inc.c
+++ b/src/game/behaviors/yoshi.inc.c
@@ -99,11 +99,11 @@ void yoshi_talk_loop(void) {
 
     if ((s16) o->oMoveAngleYaw == angleToPlayer) {
         if (sYoshiTalkingState == 0) {
+            play_puzzle_jingle();
             sYoshiTalkingState = 1;
         }
     } else {
         cur_obj_init_animation(1);
-        play_puzzle_jingle();
         o->oMoveAngleYaw = approach_s16_symmetric(o->oMoveAngleYaw, angleToPlayer, 0x500);
     }
 }
@@ -225,8 +225,8 @@ void bhv_yoshi_loop(void) {
 
     if (sYoshiTalkingState > 2) {
         if (gHudDisplay.lives >= 100) {
-            play_sound(SOUND_GENERAL_COLLECT_1UP, gDefaultSoundArgs);
             gSpecialTripleJump = 1;
+            sYoshiTalkingState = 3;
         } else if ((gGlobalTimer & 0x03) == 0) {
             play_sound(SOUND_MENU_YOSHI_GAIN_LIVES, gDefaultSoundArgs);
             gMarioStates[0].numLives++;