diff --git a/app/assets/javascripts/discourse/app/lib/uppy/composer-upload.js b/app/assets/javascripts/discourse/app/lib/uppy/composer-upload.js
index 17112a9a919..48777aa1220 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy/composer-upload.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy/composer-upload.js
@@ -352,10 +352,7 @@ export default class UppyComposerUpload {
         });
 
         const MIN_IMAGES_TO_AUTO_GRID = 3;
-        if (
-          this.siteSettings.experimental_auto_grid_images &&
-          this.#consecutiveImages?.length >= MIN_IMAGES_TO_AUTO_GRID
-        ) {
+        if (this.#consecutiveImages?.length >= MIN_IMAGES_TO_AUTO_GRID) {
           this.#autoGridImages();
         }
       });
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index afe43cf5363..bb92c1e8fec 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2728,7 +2728,6 @@ en:
     experimental_form_templates: "EXPERIMENTAL: Enable the form templates feature. <b>After enabled,</b> manage the templates at <a href='%{base_path}/admin/customize/form-templates'>Customize / Templates</a>."
     admin_sidebar_enabled_groups: "Enable sidebar navigation for the admin UI for the specified groups, which replaces the top-level admin navigation buttons."
     lazy_load_categories_groups: "EXPERIMENTAL: Lazy load category information only for users of these groups. This improves performance on sites with many categories."
-    experimental_auto_grid_images: "EXPERIMENTAL: Automatically wraps images in [grid] tags when 3 or more images are uploaded in the composer."
 
     page_loading_indicator: "Configure the loading indicator which appears during page navigations within Discourse. 'Spinner' is a full page indicator. 'Slider' shows a narrow bar at the top of the screen."
     show_user_menu_avatars: "Show user avatars in the user menu"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0f1e6036295..b55911040fe 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2471,9 +2471,6 @@ developer:
     default: 50
     hidden: true
     client: true
-  experimental_auto_grid_images:
-    default: false
-    client: true
 
 navigation:
   navigation_menu:
diff --git a/spec/system/composer_uploads_spec.rb b/spec/system/composer_uploads_spec.rb
index bbee973b819..deaf75a47a1 100644
--- a/spec/system/composer_uploads_spec.rb
+++ b/spec/system/composer_uploads_spec.rb
@@ -160,8 +160,6 @@ describe "Uploading files in the composer", type: :system do
   end
 
   context "when multiple images are uploaded" do
-    before { SiteSetting.experimental_auto_grid_images = true }
-
     it "automatically wraps images in [grid] tags on 3 or more images" do
       visit "/new-topic"
       expect(composer).to be_opened
@@ -227,8 +225,6 @@ describe "Uploading files in the composer", type: :system do
     end
 
     it "does not automatically wrap images in [grid] tags when setting is disabled" do
-      SiteSetting.experimental_auto_grid_images = false
-
       visit "/new-topic"
       expect(composer).to be_opened