diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index 53b2ba7a35..459d1d3360 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -445,10 +445,12 @@ static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx)
             this->actor.draw = BgTokiSwd_Draw; //sword has been placed, draw the master sword
         }
         BgTokiSwd_SetupAction(this, func_808BB128);
-        return;
     }
-    player = PLAYER;
-    player->interactRangeActor = &this->actor;
+    else
+    {
+        player = PLAYER;
+        player->interactRangeActor = &this->actor;
+    }
 }
 
 static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx)