diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 85e2d223af..86631130bd 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -23,14 +23,8 @@
         "siteId": 1,
         "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
     },
-    "phasedRollOut": {
-        "feature_lazyloading": {
-            "offset": 1539684000000,
-            "period": 604800000
-        }
-    },
     "features": {
-        "feature_lazyloading": "enable"
+        "feature_cross_signing": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
diff --git a/riot.im/app/config.json b/riot.im/app/config.json
index 100051537e..da45ee86a8 100644
--- a/riot.im/app/config.json
+++ b/riot.im/app/config.json
@@ -13,6 +13,7 @@
     "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
+        "feature_cross_signing": "enable"
     },
     "piwik": {
         "url": "https://piwik.riot.im/",