diff --git a/Modules/GuessManager.cs b/Modules/GuessManager.cs
index 7f75a0223..fd7ba6e6a 100644
--- a/Modules/GuessManager.cs
+++ b/Modules/GuessManager.cs
@@ -300,7 +300,7 @@ public static class GuessManager
                         case CustomRoles.Phantasm:
                             ShowMessage("GuessPhantom");
                             return true;
-                        case CustomRoles.Snitch when target.GetTaskState().RemainingTasksCount <= Snitch.RemainingTasksToBeFound:
+                        case CustomRoles.Snitch when pc.IsSnitchTarget() && target.GetTaskState().RemainingTasksCount <= Snitch.RemainingTasksToBeFound:
                             ShowMessage("EGGuessSnitchTaskDone");
                             return true;
                         case CustomRoles.Merchant when Merchant.IsBribedKiller(pc, target):