diff --git a/Roles/Neutral/Amnesiac.cs b/Roles/Neutral/Amnesiac.cs
index 9c2d264fe5..02aa8f9f3b 100644
--- a/Roles/Neutral/Amnesiac.cs
+++ b/Roles/Neutral/Amnesiac.cs
@@ -37,12 +37,10 @@ public override void SetupCustomOption()
     }
     public override void Init()
     {
-
         CanUseVent.Clear();
     }
     public override void Add(byte playerId)
     {
-
         CanUseVent[playerId] = AmnesiacCanUseVent.GetBool();
 
         if (ShowArrows.GetBool())
@@ -52,8 +50,10 @@ public override void Add(byte playerId)
     }
     public override void Remove(byte playerId)
     {
-
         CheckDeadBodyOthers.Remove(CheckDeadBody);
+
+        if (ShowArrows.GetBool())
+            LocateArrow.RemoveAllTarget(playerId);
     }
     public override void ApplyGameOptions(IGameOptions opt, byte playerId)
     {