diff --git a/app/build.gradle b/app/build.gradle
index c496d99780..96b8283859 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 102108
-        versionName "102.8 - Beta"
+        versionCode 102109
+        versionName "102.9 - Beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e42ac2f8df..5285addfae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102108" android:versionName="102.8 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102109" android:versionName="102.9 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java
index b35da4f281..0e560f4745 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java
@@ -27,7 +27,7 @@ public final class StoreMessages$deleteMessage$2 extends o implements Function0<
         if (this.$message.isLocal()) {
             String nonce = this.$message.getNonce();
             if (nonce != null) {
-                StoreMessages.access$getMessageQueue(this.this$0, this.$channelId).cancel(nonce);
+                StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$channelId).cancel(nonce);
             }
             StoreMessages.access$handleLocalMessageDelete(this.this$0, this.$message);
             Integer type = this.$message.getType();
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java
index ef828de4e8..158caab654 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java
@@ -20,9 +20,9 @@ public final class StoreMessages$sendMessage$5<T> implements Action1<Emitter<Mes
     }
 
     public final void call(Emitter<MessageResult> emitter) {
-        MessageQueue access$getMessageQueue = StoreMessages.access$getMessageQueue(this.this$0, this.$channelId);
+        MessageQueue access$getOrCreateMessageQueue = StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$channelId);
         Function1 function1 = this.$request;
         m.checkNotNullExpressionValue(emitter, "emitter");
-        access$getMessageQueue.enqueue((MessageRequest) function1.invoke(emitter));
+        access$getOrCreateMessageQueue.enqueue((MessageRequest) function1.invoke(emitter));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java
index 672d97f84d..6917804e20 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java
@@ -26,6 +26,6 @@ public final class StoreMessages$sendMessage$7<T> implements Action1<Emitter<Mes
         com.discord.api.message.Message synthesizeApiMessage = this.$message.synthesizeApiMessage();
         ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$applicationCommandLocalSendData;
         UtcDateTime timestamp = this.$message.getTimestamp();
-        StoreMessages.access$getMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, this.$attachments, new StoreMessages$sendMessage$7$request$2(this), new StoreMessages$sendMessage$7$request$3(this), new StoreMessages$sendMessage$7$request$1(this, emitter), timestamp != null ? timestamp.g() : 0));
+        StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, this.$attachments, new StoreMessages$sendMessage$7$request$2(this), new StoreMessages$sendMessage$7$request$3(this), new StoreMessages$sendMessage$7$request$1(this, emitter), timestamp != null ? timestamp.g() : 0));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessages.java b/app/src/main/java/com/discord/stores/StoreMessages.java
index 69b9f7c05b..4a66a9a49a 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages.java
@@ -117,8 +117,8 @@ public final class StoreMessages extends Store {
         return storeMessages.initResendFinished;
     }
 
-    public static final /* synthetic */ MessageQueue access$getMessageQueue(StoreMessages storeMessages, long j) {
-        return storeMessages.getMessageQueue(j);
+    public static final /* synthetic */ MessageQueue access$getOrCreateMessageQueue(StoreMessages storeMessages, long j) {
+        return storeMessages.getOrCreateMessageQueue(j);
     }
 
     public static final /* synthetic */ StoreStream access$getStream$p(StoreMessages storeMessages) {
@@ -149,9 +149,8 @@ public final class StoreMessages extends Store {
         storeMessages.trackFailedLocalMessageResolved(message, failedMessageResolutionType);
     }
 
-    private final synchronized MessageQueue getMessageQueue(long j) {
-        MessageQueue messageQueue;
-        messageQueue = this.messageQueues.get(Long.valueOf(j));
+    private final MessageQueue getOrCreateMessageQueue(long j) {
+        MessageQueue messageQueue = this.messageQueues.get(Long.valueOf(j));
         if (messageQueue == null) {
             Context context = this.context;
             if (context == null) {
@@ -162,7 +161,9 @@ public final class StoreMessages extends Store {
             ExecutorService executorService = this.queueExecutor;
             m.checkNotNullExpressionValue(executorService, "queueExecutor");
             messageQueue = new MessageQueue(contentResolver, executorService, this.clock);
-            this.messageQueues.put(Long.valueOf(j), messageQueue);
+            synchronized (this.messageQueues) {
+                this.messageQueues.put(Long.valueOf(j), messageQueue);
+            }
         }
         return messageQueue;
     }
@@ -429,13 +430,13 @@ public final class StoreMessages extends Store {
 
     public final void cancelMessageSend(long j, String str) {
         m.checkNotNullParameter(str, "requestId");
-        getMessageQueue(j).cancel(str);
+        getOrCreateMessageQueue(j).cancel(str);
     }
 
     @StoreThread
     public final void deleteLocalMessage(long j, String str) {
         m.checkNotNullParameter(str, "nonce");
-        getMessageQueue(j).cancel(str);
+        getOrCreateMessageQueue(j).cancel(str);
         handleLocalMessageDelete(j, str);
     }
 
@@ -453,7 +454,7 @@ public final class StoreMessages extends Store {
 
     public final void editMessage(long j, long j2, String str, MessageAllowedMentions messageAllowedMentions) {
         m.checkNotNullParameter(str, "content");
-        getMessageQueue(j2).enqueue(new MessageRequest.Edit(j2, str, j, messageAllowedMentions, this.clock.currentTimeMillis()));
+        getOrCreateMessageQueue(j2).enqueue(new MessageRequest.Edit(j2, str, j, messageAllowedMentions, this.clock.currentTimeMillis()));
     }
 
     public final Observable<Set<Long>> getAllDetached() {
@@ -480,10 +481,12 @@ public final class StoreMessages extends Store {
             this.holder.invalidate();
             return;
         }
-        Collection<MessageQueue> values = this.messageQueues.values();
-        m.checkNotNullExpressionValue(values, "messageQueues.values");
-        for (MessageQueue messageQueue : values) {
-            messageQueue.handleConnected();
+        synchronized (this.messageQueues) {
+            Collection<MessageQueue> values = this.messageQueues.values();
+            m.checkNotNullExpressionValue(values, "messageQueues.values");
+            for (MessageQueue messageQueue : values) {
+                messageQueue.handleConnected();
+            }
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
index 34943b39f6..1450a0d2e9 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
         String string = getString(R.string.app_information);
-        textView.setText(string + " - 102.8 - Beta (102108)");
+        textView.setText(string + " - 102.9 - Beta (102109)");
         binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0516c71442..7d8440a74c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1505,7 +1505,7 @@
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887585_com_crashlytics_android_build_id">9829ea7736fa44f496b851ce59dbaf13</string>
+    <string name="res_2131887585_com_crashlytics_android_build_id">323b67b63d7148ec9fb7fbedd48e92eb</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>