diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 2a9f3b38..03f77170 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -202,6 +202,24 @@
 
           <div
             class="format-selector-container">
+            <div
+              v-if="$store.state.config.languageSelectorVisibility"
+              class="format-selector"
+              >
+              <Select
+                id="post-language"
+                v-model="newStatus.language"
+                class="form-control"
+              >
+                <option
+                  v-for="language in postLanguageOptions"
+                  :key="language.key"
+                  :value="language.value"
+                >
+                  {{ language.label }}
+                </option>
+              </Select>
+            </div>
             <div
               v-if="postFormats.length > 1"
               class="text-format format-selector"
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index c6bebf84..a8c44344 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -619,6 +619,13 @@
             {{ $t('settings.post_language') }}
           </ChoiceSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="languageSelectorVisibility"
+          >
+            {{ $t('settings.languageSelectorVisibility') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 441d2189..610ceba8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -688,6 +688,7 @@
         "post_look_feel": "Posts Look & Feel",
         "post_status_content_type": "Default post content type",
         "post_language": "Default post language",
+        "languageSelectorVisibility": "Show the language selector in the post form",
         "posts": "Posts",
         "preload_images": "Preload images",
         "presets": "Presets",
diff --git a/src/modules/config.js b/src/modules/config.js
index 782e2df6..d8d4f5e8 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -124,6 +124,7 @@ export const defaultState = {
   useBlurhash: true,
   overrideInstanceWallpaper: false,
   federatedTimelineVisible: false,
+  languageSelectorVisibility: false,
 }
 
 // caching the instance default properties