diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 94dd7e357c2..6f196234a41 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -43,7 +43,7 @@ END TEMPLATE-->
 
 ### Bugfixes
 
-*None yet*
+* Fixed an `InvalidOperationException` that could be thrown when reconnecting, caused by completing an already-finished status-change task.
 
 ### Other
 
diff --git a/Robust.Shared/Network/NetManager.cs b/Robust.Shared/Network/NetManager.cs
index 371f97327f5..de6b5de66af 100644
--- a/Robust.Shared/Network/NetManager.cs
+++ b/Robust.Shared/Network/NetManager.cs
@@ -792,7 +792,7 @@ private void HandleStatusChanged(NetPeerData peer, NetIncomingMessage msg)
             {
                 _awaitingStatusChange.Remove(sender);
                 resume.Item1.Dispose();
-                resume.Item2.SetResult(reason);
+                resume.Item2.TrySetResult(reason);
                 return;
             }