diff --git a/README.md b/README.md
index 6a6f11ae..0432d05a 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ function App() {
 | **emojiVersion** | `14` | `1`, `2`, `3`, `4`, `5`, `11`, `12`, `12.1`, `13`, `13.1`, `14` | The version of the emoji data to use. Latest version supported in `@emoji-mart/data` is currently [14](https://emojipedia.org/emoji-14.0) |
 | **exceptEmojis** | `[]` | | List of emoji IDs that will be excluded from the picker |
 | **icons** | `auto` | `auto`, `outline`, `solid` | The type of icons to use for the picker. `outline` with light theme and `solid` with dark theme. |
-| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `ko`, `nl`, `pl`, `pt`, `ru`, `sa`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
+| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `ko`, `nl`, `pl`, `pt`, `ru`, `sa`, `th`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
 | **maxFrequentRows** | `4` | | The maximum number of frequent rows to show. `0` will disable frequent category |
 | **navPosition** | `top` | `top`, `bottom`, `none` | The position of the navigation bar |
 | **noCountryFlags** | `false` | | Whether to show country flags or not. If not provided, tbhis is handled automatically (Windows doesn’t support country flags) |
diff --git a/packages/emoji-mart-data/i18n/th.json b/packages/emoji-mart-data/i18n/th.json
new file mode 100644
index 00000000..34a3be5f
--- /dev/null
+++ b/packages/emoji-mart-data/i18n/th.json
@@ -0,0 +1,29 @@
+{
+  "search": "ค้นหา",
+  "search_no_results_1": "โอ้ ไม่นะ!",
+  "search_no_results_2": "ไม่พบอิโมจินั้น",
+  "pick": "เลือกอิโมจิ…",
+  "add_custom": "เพิ่มอิโมจิแบบกำหนดเอง",
+  "categories": {
+    "activity": "กิจกรรม",
+    "custom": "กำหนดเอง",
+    "flags": "ธง",
+    "foods": "อาหารและเครื่องดื่ม",
+    "frequent": "ใช้บ่อย",
+    "nature": "สัตว์และธรรมชาติ",
+    "objects": "สิ่งของ",
+    "people": "ใบหน้าและคน",
+    "places": "การเดินทางและสถานที่",
+    "search": "ผลการค้นหา",
+    "symbols": "สัญลักษณ์"
+  },
+  "skins": {
+    "choose": "เลือกโทนสีผิวเริ่มต้น",
+    "1": "ค่าเริ่มต้น",
+    "2": "สีอ่อน",
+    "3": "สีกลาง-อ่อน",
+    "4": "สีกลาง",
+    "5": "สีกลาง-เข้ม",
+    "6": "สีเข้ม"
+  }
+}
diff --git a/packages/emoji-mart-website/index.html b/packages/emoji-mart-website/index.html
index 201b06a5..d94c5256 100644
--- a/packages/emoji-mart-website/index.html
+++ b/packages/emoji-mart-website/index.html
@@ -81,6 +81,7 @@
             <option value="pt">Português</option>
             <option value="ru">Русский</option>
             <option value="sa">संस्कृतम्</option>
+            <option value="th">ภาษาไทย</option>
             <option value="tr">Türkçe</option>
             <option value="uk">Українська</option>
             <option value="vi">Tiếng Việt</option>
diff --git a/packages/emoji-mart/README.md b/packages/emoji-mart/README.md
index 6a6f11ae..0432d05a 100644
--- a/packages/emoji-mart/README.md
+++ b/packages/emoji-mart/README.md
@@ -103,7 +103,7 @@ function App() {
 | **emojiVersion** | `14` | `1`, `2`, `3`, `4`, `5`, `11`, `12`, `12.1`, `13`, `13.1`, `14` | The version of the emoji data to use. Latest version supported in `@emoji-mart/data` is currently [14](https://emojipedia.org/emoji-14.0) |
 | **exceptEmojis** | `[]` | | List of emoji IDs that will be excluded from the picker |
 | **icons** | `auto` | `auto`, `outline`, `solid` | The type of icons to use for the picker. `outline` with light theme and `solid` with dark theme. |
-| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `ko`, `nl`, `pl`, `pt`, `ru`, `sa`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
+| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `ko`, `nl`, `pl`, `pt`, `ru`, `sa`, `th`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
 | **maxFrequentRows** | `4` | | The maximum number of frequent rows to show. `0` will disable frequent category |
 | **navPosition** | `top` | `top`, `bottom`, `none` | The position of the navigation bar |
 | **noCountryFlags** | `false` | | Whether to show country flags or not. If not provided, tbhis is handled automatically (Windows doesn’t support country flags) |
diff --git a/packages/emoji-mart/src/components/Picker/PickerProps.ts b/packages/emoji-mart/src/components/Picker/PickerProps.ts
index 50eb7186..4ff256a6 100644
--- a/packages/emoji-mart/src/components/Picker/PickerProps.ts
+++ b/packages/emoji-mart/src/components/Picker/PickerProps.ts
@@ -49,6 +49,7 @@ export default {
       'pt',
       'ru',
       'sa',
+      'th',
       'tr',
       'uk',
       'vi',