diff --git a/Tusker/API/MastodonController.swift b/Tusker/API/MastodonController.swift
index 9dfbd0e6..cfe70161 100644
--- a/Tusker/API/MastodonController.swift
+++ b/Tusker/API/MastodonController.swift
@@ -321,7 +321,9 @@ class MastodonController: ObservableObject {
             let request = Client.getCustomEmoji()
             run(request) { (response) in
                 if case let .success(emojis, _) = response {
-                    self.customEmojis = emojis
+                    DispatchQueue.main.async {
+                        self.customEmojis = emojis
+                    }
                     completion(emojis)
                 } else {
                     completion([])