address deadlock introduced in cd2469d3

69 jobs for !2734 with 1441-threadsanitizer-lock-order-inversion-potential-deadlock-usr-lib-x86_64-linux-gnu-libtsan-so-0 in 26 minutes and 9 seconds (queued for 7 seconds)
merge request