diff --git a/docs/labs.md b/docs/labs.md
index 09a8e0c95c..a5fab86603 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -100,10 +100,21 @@ theme definition.
 
 For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
 
-## New room list (`feature_new_room_list`)
+## New room list
 
 A complete rewrite of the room list is underway to increase performance, stability,
-and general usability. This is still rapidly changing, but feel free to give it a test.
+and general usability.
+
+In the event the new room list needs to be disabled, add this to your config.json:
+```json
+{
+    "settingDefaults": {
+        "feature_new_room_list": false
+    }
+}
+```
+
+**Note**: In a future release the new room list will not be optional.
 
 ## IRC message layout (`feature_irc_ui`)