diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index bebb254afc..ef0130ec15 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -220,6 +220,16 @@ class MatrixClientPeg {
             identityServer: new IdentityAuthClient(),
         };
 
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            // TODO: Cross-signing keys are temporarily in memory only. A
+            // separate task in the cross-signing project will build from here.
+            const keys = [];
+            opts.cryptoCallbacks = {
+                getCrossSigningKey: k => keys[k],
+                saveCrossSigningKeys: newKeys => Object.assign(keys, newKeys),
+            };
+        }
+
         this.matrixClient = createMatrixClient(opts);
 
         // we're going to add eventlisteners for each matrix event tile, so the
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dc9773ad21..8469f62d5c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -342,6 +342,7 @@
     "Use the new, consistent UserInfo panel for Room Members and Group Members": "Use the new, consistent UserInfo panel for Room Members and Group Members",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Send verification requests in direct message": "Send verification requests in direct message",
+    "Enable cross-signing to verify per-user instead of per-device": "Enable cross-signing to verify per-user instead of per-device",
     "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 973d389ba6..c63217775a 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -146,6 +146,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_cross_signing": {
+        isFeature: true,
+        displayName: _td("Enable cross-signing to verify per-user instead of per-device"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "useCiderComposer": {
         displayName: _td("Use the new, faster, composer for writing messages"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,