diff --git a/Items/goldstar.asm b/Items/goldstar.asm
index f5fd9aa..daa011b 100644
--- a/Items/goldstar.asm
+++ b/Items/goldstar.asm
@@ -1014,8 +1014,12 @@ CheckForSwitchToGoldstar:
 
 Goldstar_GetDragged:
 {
+  LDA.w GoldstarOrHookshot : CMP.b #$02 : BNE +
+    STZ.w $0112
+    STZ.w $037E
+    RTL
+  +
   JSL LinkHop_FindArbitraryLandingSpot
-  STZ.w $0112
   RTL
 }