diff --git a/Items/goldstar.asm b/Items/goldstar.asm
index 0dc85c4..10dd780 100644
--- a/Items/goldstar.asm
+++ b/Items/goldstar.asm
@@ -1025,6 +1025,16 @@ MaybeUploadBirdGraphicsToOam:
     JML $008B50
 }
 
+ApplyGoldstarDamageClass:
+{
+  ; If the goldstar is active swap in the damage class
+  LDA GoldstarOrHookshot : CMP #$02 : BNE .return
+    LDA #$03
+.return
+  JSL $06ED25 ; .apply
+  RTL
+}
+
 pushpc
 
 ; =========================================================
@@ -1033,6 +1043,9 @@ pushpc
 org $07AB25
   JSL CheckForSwitchToGoldstar
 
+org $06ECF2
+  JSL ApplyGoldstarDamageClass
+
 org $07AB3A ;$07AB40
   JSL BeginGoldstarOrHookshot
   RTS