diff --git a/docs/release-notes.md b/docs/release-notes.md
index 7724904b..3041dbd3 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -4,6 +4,7 @@ These changes have not been released yet.
 
 * For players:
   * Fixed Save Backup not pruning old backups if they're uncompressed.
+  * Fixed issues when a farmhand reconnects before the game notices they're disconnected.
 
 * For modders:
   * Added `IContentPack.HasFile` method.
diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs
index 0241ef02..dde71092 100644
--- a/src/SMAPI/Framework/SMultiplayer.cs
+++ b/src/SMAPI/Framework/SMultiplayer.cs
@@ -201,7 +201,8 @@ namespace StardewModdingAPI.Framework
                         MultiplayerPeer newPeer = new MultiplayerPeer(message.FarmerID, model, sendMessage, isHost: false);
                         if (this.Peers.ContainsKey(message.FarmerID))
                         {
-                            this.Monitor.Log($"Rejected mod context from farmhand {message.FarmerID}: already received context for that player.", LogLevel.Error);
+                            this.Monitor.Log($"Received mod context from farmhand {message.FarmerID}, but the game didn't see them disconnect. This may indicate issues with the network connection.", LogLevel.Info);
+                            this.Peers.Remove(message.FarmerID);
                             return;
                         }
                         this.AddPeer(newPeer, canBeHost: false, raiseEvent: false);