diff --git a/Items/goldstar.asm b/Items/goldstar.asm
index ea0ad89..0b5ea8a 100644
--- a/Items/goldstar.asm
+++ b/Items/goldstar.asm
@@ -1002,6 +1002,7 @@ ApplyGoldstarDamageClass:
 CheckForSwitchToGoldstar:
 {
   %CheckNewR_ButtonPress() : BEQ .continue
+  LDA.l $7EF342 : CMP.b #$02 : BNE .continue
     LDA.w GoldstarOrHookshot : CMP.b #$01 : BEQ .set_hookshot
       LDA.b #$01 : STA.w GoldstarOrHookshot
       JMP .continue