diff --git a/src/E2EEBanner.tsx b/src/E2EEBanner.tsx
index 957813e3..774f3582 100644
--- a/src/E2EEBanner.tsx
+++ b/src/E2EEBanner.tsx
@@ -19,8 +19,12 @@ import { Trans } from "react-i18next";
 import { Banner } from "./Banner";
 import styles from "./E2EEBanner.module.css";
 import { ReactComponent as LockOffIcon } from "./icons/LockOff.svg";
+import { useEnableE2EE } from "./settings/useSetting";
 
 export const E2EEBanner = () => {
+  const [e2eeEnabled] = useEnableE2EE();
+  if (e2eeEnabled) return null;
+
   return (
     <Banner>
       <div className={styles.e2eeBanner}>
diff --git a/src/E2EELock.tsx b/src/E2EELock.tsx
index d032b036..9a9a55e9 100644
--- a/src/E2EELock.tsx
+++ b/src/E2EELock.tsx
@@ -26,10 +26,7 @@ import { TooltipTrigger } from "./Tooltip";
 export const E2EELock = () => {
   const { t } = useTranslation();
   const tooltip = useCallback(
-    () =>
-      t(
-        "Element Call is temporarily not end-to-end encrypted while we test scalability."
-      ),
+    () => t("This call is not end-to-end encrypted."),
     [t]
   );