diff --git a/config.sample.json b/config.sample.json
index ac22b5bfa..7c75635bc 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -22,8 +22,7 @@
     "features": {
         "feature_groups": "labs",
         "feature_pinning": "labs",
-        "feature_reactions": "labs",
-        "feature_message_editing": "labs"
+        "feature_reactions": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index 3d568a2b8..65b71b346 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -35,11 +35,4 @@ That's it. Now should see your new counter under the header.
 reactions from other people. This feature is currently under active development,
 and only portions have been implemented so far.
 
-## Message editing
-
-`feature_message_editing` allows editing messages after they have been sent,
-accessible from the reaction/context bar when hovering a message.
-This feature is currently under active development,
-and only portions have been implemented so far.
-
 [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index e24d8ecf0..27311da27 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -31,8 +31,7 @@
     },
     "features": {
         "feature_lazyloading": "enable",
-        "feature_reactions": "enable",
-        "feature_message_editing": "enable"
+        "feature_reactions": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index b687235c3..86623e7e0 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -26,8 +26,7 @@
         "feature_sas": "labs",
         "feature_room_breadcrumbs": "labs",
         "feature_state_counters": "labs",
-        "feature_reactions": "enable",
-        "feature_message_editing": "enable"
+        "feature_reactions": "enable"
     },
     "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {