diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 82716cb4..5a1024ff 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -176,6 +176,8 @@ namespace TShockAPI
 			string logFilename;
 			string logPathSetupWarning;
 
+			TerrariaApi.Reporting.CrashReporter.HeapshotRequesting += CrashReporter_HeapshotRequesting;
+
 			try
 			{
 				HandleCommandLine(Environment.GetCommandLineArgs());
@@ -339,6 +341,14 @@ namespace TShockAPI
 			}
 		}
 
+		protected void CrashReporter_HeapshotRequesting(object sender, EventArgs e)
+		{
+			foreach (TSPlayer player in TShock.Players)
+			{
+				player.User = null;
+			}
+		}
+
 		/// <summary>Dispose - Called when disposing.</summary>
 		/// <param name="disposing">disposing - If set, disposes of all hooks and other systems.</param>
 		protected override void Dispose(bool disposing)