diff --git a/CHANGELOG.md b/CHANGELOG.md
index c825257f..9940a361 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Fixed erroneous kicks and bans when using `KickOnMediumcoreDeath` and `BanOnMediumcoreDeath` options. (@DankRank)
 * Removed `TSPlayer.InitSpawn` field. (@DankRank)
 * `OnPlayerSpawn`'s player ID field is now `PlayerId`. (@DankRank)
+* Fixed null reference console spam in non-SSC mode (@QuiCM)
 * `Utils.TryParseTime` can now take spaces (e.g., `3d 5h 2m 3s`) (@QuiCM)
 * Enabled banning unregistered users (@QuiCM)
 * Added filtering and validation on packet 96 (Teleport player through portal) (@QuiCM)
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 7ba6986d..6971ca65 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1925,6 +1925,8 @@ namespace TShockAPI
 			var account = TShock.UserAccounts.GetUserAccountByName(args.Player.Name);
 			args.Player.DataWhenJoined = new PlayerData(args.Player);
 			args.Player.DataWhenJoined.CopyCharacter(args.Player);
+			args.Player.PlayerData = new PlayerData(args.Player);
+			args.Player.PlayerData.CopyCharacter(args.Player);
 
 			if (account != null && !TShock.Config.DisableUUIDLogin)
 			{