diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
index 1bc0012af..d2e8cebe6 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
@@ -2616,6 +2616,7 @@ public class Theme {
 
     public static ArrayList<ThemeInfo> themes;
     public static final ArrayList<ChatThemeBottomSheet.ChatThemeItem> defaultEmojiThemes = new ArrayList<>();
+    private static boolean tryToFixMissingEmojiThemes = false;
     private static ArrayList<ThemeInfo> otherThemes;
     private static HashMap<String, ThemeInfo> themesDict;
     private static ThemeInfo currentTheme;
@@ -7365,6 +7366,13 @@ public class Theme {
                     PatternsLoader.createLoader(true);
                 }
                 generateEmojiPreviewThemes(emojiPreviewThemes, currentAccount);
+            } else if (response instanceof TLRPC.TL_account_themesNotModified) {
+                if (defaultEmojiThemes.isEmpty() && !tryToFixMissingEmojiThemes) {
+                    // Fix Missing Emoji Themes in v8.3.0-preview01?
+                    remoteThemesHash.put(currentAccount, 0);
+                    tryToFixMissingEmojiThemes = true;
+                    loadRemoteThemes(currentAccount, true);
+                }
             }
         }));
     }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
index a2a039def..004d1f5ab 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
@@ -37,6 +37,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import android.text.TextPaint;
 import android.text.TextUtils;
+import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;