diff --git a/SignalServiceKit/src/Util/DispatchQueue+OWS.swift b/SignalServiceKit/src/Util/DispatchQueue+OWS.swift
index 35cc92f193..eb4aa19399 100644
--- a/SignalServiceKit/src/Util/DispatchQueue+OWS.swift
+++ b/SignalServiceKit/src/Util/DispatchQueue+OWS.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2022 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -18,13 +18,6 @@ extension DispatchQueue {
                              autoreleaseFrequency: .workItem)
     }()
 
-    public static let sharedUserInitiatedConcurrent: DispatchQueue = {
-        return DispatchQueue(label: "org.whispersystems.signal.sharedUserInitiatedConcurrent",
-                             qos: .userInitiated,
-                             attributes: [.concurrent],
-                             autoreleaseFrequency: .workItem)
-    }()
-
     public static let sharedUtility: DispatchQueue = {
         return DispatchQueue(label: "org.whispersystems.signal.sharedUtility",
                              qos: .utility,
diff --git a/SignalUI/Views/ConversationAvatarView.swift b/SignalUI/Views/ConversationAvatarView.swift
index 5011ea3b58..e4462f8344 100644
--- a/SignalUI/Views/ConversationAvatarView.swift
+++ b/SignalUI/Views/ConversationAvatarView.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2022 Open Whisper Systems. All rights reserved.
 //
 
 import UIKit
@@ -250,12 +250,8 @@ public class ConversationAvatarView: UIView, CVView, PrimaryImageView {
                 self.setNeedsLayout()
             }
         }
-        if Thread.isMainThread {
+        DispatchMainThreadSafe {
             uiUpdateBlock()
-        } else {
-            DispatchQueue.main.async {
-                uiUpdateBlock()
-            }
         }
     }