diff --git a/config.sample.json b/config.sample.json
index 8ab4e994e..a4110a159 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -31,8 +31,7 @@
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",
         "feature_state_counters": "labs",
-        "feature_irc_ui": "labs",
-        "feature_no_timeline_avatars": "labs"
+        "feature_irc_ui": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index e4fc8ed4c..39d9dfcb1 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -123,15 +123,10 @@ normally these themes need to be defined in the config for Riot. This labs flag
 adds an ability for end users to add themes themselves by using a URL to the JSON
 theme definition.
 
+For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
+
 ## IRC message layout (`feature_irc_ui`)
 
 Adds an option to change the message layout to an IRC style ` timestamp | avatar
 | name | message `
 
-## Remove timeline avatars (`feature_no_timeline_avatars`)
-
-Adds the option to remove the avatars in the message layout. This is intended to
-be used in conjunction with the irc layout however it available for both
-layouts.
-
-For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index ab09c54e7..5dcc91e0e 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -27,8 +27,7 @@
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs",
-        "feature_irc_ui": "labs",
-        "feature_no_timeline_avatars": "labs"
+        "feature_irc_ui": "labs"
     },
     "piwik": {
         "url": "https://piwik.riot.im/",