diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst
index 268ea2ab4b0c3fd4f00ecd65b89656f6dffd4298..0a8c290512536359a8900a3ce51cfc1513e47529 100644
--- a/doc/source/configuration/settings.rst
+++ b/doc/source/configuration/settings.rst
@@ -2065,29 +2065,6 @@ This setting specifies the type of in-browser console used to access the VMs.
 Valid values are  ``"AUTO"``, ``"VNC"``, ``"SPICE"``, ``"RDP"``,
 ``"SERIAL"``, ``"MKS"``, and ``None``.
 
-ENABLE_FLAVOR_EDIT
-~~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 12.0.0(Pike)
-
-.. deprecated:: 12.0.0(Pike)
-
-Default: ``False``
-
-This setting enables the ability to edit flavors.
-
-.. warning::
-
-  Historically, Horizon has provided the ability to edit Flavors by deleting
-  and creating a new one with the same information. This is not supported in
-  the Nova API and causes unexpected issues and breakages. To avoid breaking
-  standard deprecation procedure, this code is still in Horizon, but disabled
-  by default. It will be removed during the 14.0.0 ('R') release cycle.
-
-  See `this email thread
-  <http://lists.openstack.org/pipermail/openstack-dev/2017-August/120540.html>`_
-  for further information.
-
 INSTANCE_LOG_LENGTH
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/openstack_dashboard/management/commands/upgrade_check.py b/openstack_dashboard/management/commands/upgrade_check.py
index 60e039f1a52430e4d80a49dfa3f1c0368d48cb3d..2aed3eb24d7e497276b26e7e34805c04f6c205f5 100644
--- a/openstack_dashboard/management/commands/upgrade_check.py
+++ b/openstack_dashboard/management/commands/upgrade_check.py
@@ -166,7 +166,7 @@ def check_invalid_settings(dummy=None):
 
 @register_check(_("Deprecated Settings"))
 def check_deprecated_settings(dummy=None):
-    DEPRECATED_SETTINGS = {'ENABLE_FLAVOR_EDIT'}
+    DEPRECATED_SETTINGS = set()
     deprecated = []
     for setting in dir(settings):
         if not setting.isupper() or setting.startswith("_"):
diff --git a/releasenotes/notes/remove-enable-flavor-edit-config-option-0733b2ebb2ee1b4d.yaml b/releasenotes/notes/remove-enable-flavor-edit-config-option-0733b2ebb2ee1b4d.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..add741b52282905353419708044003b0210639dc
--- /dev/null
+++ b/releasenotes/notes/remove-enable-flavor-edit-config-option-0733b2ebb2ee1b4d.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Deprecated config option ENABLE_FLAVOR_EDIT is removed.