Fix for Matrix Config unique key violation