single-row deadlock

Hi,

After upgrading from PostgreSQL 9.6 to 13 we started to experience 
locking issues once per week or two.
Replacing exclusive table lock with helper table row lock did not help.
Now it seems like a single-row deadlocks can occur, which should not be 
possible (audit_data_lock table contains one row):


blocked_pid,blocking_pid,blocked_statement,current_statement_in_blocking_process,blocked_application,blocking_application
6752,6577,update audit_data_lock set locks_used = locks_used + 1,update 
audit_data_lock set locks_used = locks_used + 1,PostgreSQL JDBC 
Driver,PostgreSQL JDBC Driver
6577,6752,update audit_data_lock set locks_used = locks_used + 1,update 
audit_data_lock set locks_used = locks_used + 1,PostgreSQL JDBC 
Driver,PostgreSQL JDBC Driver

Is this a known issue? It seems like 
https://postgrespro.com/list/thread-id/1231581. Are there any 
workarounds?