diff --git a/components/match2/commons/match.lua b/components/match2/commons/match.lua
index accc893b66d..0aeb7b5aa63 100644
--- a/components/match2/commons/match.lua
+++ b/components/match2/commons/match.lua
@@ -389,7 +389,9 @@ function Match._prepareGameRecordForStore(matchRecord, gameRecord)
 		gameRecord.participants = {}
 		for opponentId, opponent in ipairs(gameRecord.opponents) do
 			for playerId, player in pairs(opponent.players) do
-				gameRecord.participants[opponentId .. '_' .. playerId] = player
+				-- Deep copy have to be used here, otherwise a json.stringify complains about circular references
+				-- between participants and opponents
+				gameRecord.participants[opponentId .. '_' .. playerId] = Table.deepCopy(player)
 			end
 		end
 	end
diff --git a/components/match2/wikis/valorant/match_group_input_custom.lua b/components/match2/wikis/valorant/match_group_input_custom.lua
index ade2636532d..3e6b3450625 100644
--- a/components/match2/wikis/valorant/match_group_input_custom.lua
+++ b/components/match2/wikis/valorant/match_group_input_custom.lua
@@ -89,6 +89,7 @@ function CustomMatchGroupInput.extractMaps(match, opponents)
 		local winnerInput = map.winner --[[@as string?]]
 
 		map.opponents = MapFunctions.getParticipants(map, opponents)
+		map.participants = nil
 		map.extradata = MapFunctions.getExtraData(map, map.opponents)
 		map.finished = MatchGroupInputUtil.mapIsFinished(map)