diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index d40f820ac0..b8a17c0f0d 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -34,10 +34,7 @@ let secretStorageBeingAccessed = false;
let passphraseOnlyOption = null;
function isCachingAllowed() {
- return (
- secretStorageBeingAccessed ||
- SettingsStore.getValue("keepSecretStoragePassphraseForSession")
- );
+ return secretStorageBeingAccessed;
}
export class AccessCancelledError extends Error {
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 3e69107159..9724b9934f 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -66,7 +66,6 @@ export default class LabsUserSettingsTab extends React.Component {
-
);
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 225af15ec8..5e439a1d71 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -521,11 +521,6 @@ export const SETTINGS = {
displayName: _td("Enable message search in encrypted rooms"),
default: true,
},
- "keepSecretStoragePassphraseForSession": {
- supportedLevels: ['device', 'config'],
- displayName: _td("Keep recovery passphrase in memory for this session"),
- default: false,
- },
"crawlerSleepTime": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
displayName: _td("How fast should messages be downloaded."),