diff --git a/config/site_settings.yml b/config/site_settings.yml
index 4ef25f85d28..560ad131b80 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -267,12 +267,6 @@ basic:
     client: true
     default: true
     hidden: true
-  # TODO (martin) (2022-02-01) Remove this setting once plugins relying on
-  # it have been changed.
-  enable_experimental_composer_uploader:
-    client: true
-    default: false
-    hidden: true
   enable_direct_s3_uploads:
     client: true
     default: false
diff --git a/db/migrate/20211224011511_delete_experimental_composer_upload_setting.rb b/db/migrate/20211224011511_delete_experimental_composer_upload_setting.rb
new file mode 100644
index 00000000000..64751bf1438
--- /dev/null
+++ b/db/migrate/20211224011511_delete_experimental_composer_upload_setting.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class DeleteExperimentalComposerUploadSetting < ActiveRecord::Migration[6.1]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'enable_experimental_composer_uploader'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end