diff --git a/Source/Client/Patches/Feedback.cs b/Source/Client/Patches/Feedback.cs
index b698891a..e2e18e1e 100644
--- a/Source/Client/Patches/Feedback.cs
+++ b/Source/Client/Patches/Feedback.cs
@@ -250,7 +250,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
         static bool CustomTryTakeOrderedJob(Pawn_JobTracker self, Job job, JobTag? tag = JobTag.Misc,
             bool requestQueueing = false)
         {
-            if (self.TryTakeOrderedJob(job, tag, requestQueueing) && TickPatch.currentExecutingCmdIssuedBySelf)
+            if (self.TryTakeOrderedJob(job, tag, requestQueueing) && (TickPatch.currentExecutingCmdIssuedBySelf || Multiplayer.Client == null))
                 FleckMaker.Static(job.targetA.Cell, self.pawn.Map, FleckDefOf.FeedbackGoto);
             return false;
         }