diff --git a/components/match2/commons/match.lua b/components/match2/commons/match.lua
index 8507c992f3e..a0a2d809860 100644
--- a/components/match2/commons/match.lua
+++ b/components/match2/commons/match.lua
@@ -287,6 +287,9 @@ function Match._storeMatch2InLpdb(unsplitMatchRecord)
 
 	local opponentIndexes = Array.map(records.opponentRecords, function(opponentRecord, opponentIndex)
 		local playerIndexes = Array.map(records.playerRecords[opponentIndex], function(player, playerIndex)
+
+			player.extradata = Logic.nilIfEmpty(player.extradata)
+
 			return mw.ext.LiquipediaDB.lpdb_match2player(
 				matchRecord.match2id .. '_m2o_' .. string.format('%02d', opponentIndex)
 						.. '_m2p_' .. string.format('%02d', playerIndex),
@@ -294,6 +297,8 @@ function Match._storeMatch2InLpdb(unsplitMatchRecord)
 			)
 		end)
 
+		opponentRecord.extradata = Logic.nilIfEmpty(opponentRecord.extradata)
+
 		opponentRecord.match2players = table.concat(playerIndexes)
 		return mw.ext.LiquipediaDB.lpdb_match2opponent(
 			matchRecord.match2id .. '_m2o_' .. string.format('%02d', opponentIndex),