diff --git a/patches/protonmail/proton-account.patch b/patches/protonmail/proton-account.patch
index 3fdec363a..bb96f1067 100644
--- a/patches/protonmail/proton-account.patch
+++ b/patches/protonmail/proton-account.patch
@@ -36,12 +36,12 @@ index 9d333b8..2921f49 100644
 
  export default Setup;
 diff --git a/src/app/content/MainContainer.tsx b/src/app/content/MainContainer.tsx
-index cb50e5e..ca76f0f 100644
+index 73380a9..75922b7 100644
 --- a/src/app/content/MainContainer.tsx
 +++ b/src/app/content/MainContainer.tsx
-@@ -62,7 +62,7 @@ const MainContainer = () => {
-         }
-     }, []);
+@@ -43,7 +43,7 @@ const MainContainer = () => {
+         setExpand(false);
+     }, [location.pathname, location.hash]);
 
 -    const app = getAppFromPathnameSafe(location.pathname);
 +    const app = getAppFromPathnameSafe(window.location.pathname);
diff --git a/patches/protonmail/proton-mail.patch b/patches/protonmail/proton-mail.patch
index 7d9956851..c4c47c91d 100644
--- a/patches/protonmail/proton-mail.patch
+++ b/patches/protonmail/proton-mail.patch
@@ -48,3 +48,31 @@ index 3f222f7..98e9cfe 100644
              {showToolbar && (
                  <Toolbar
                      labelID={labelID}
+
+diff --git a/src/app/components/header/AdvancedSearchDropdown.tsx b/src/app/components/header/AdvancedSearchDropdown.tsx
+index 0ac0bc5..bea1c9b 100644
+--- a/src/app/components/header/AdvancedSearchDropdown.tsx
++++ b/src/app/components/header/AdvancedSearchDropdown.tsx
+@@ -330,7 +330,7 @@ const AdvancedSearchDropdown = ({ keyword: fullInput = '', isNarrow, handleCachi
+     );
+
+     // Switches
+-    const showEncryptedSearch = !isMobile() && !!esFeature && !!esFeature.Value && !!isPaid(user);
++    const showEncryptedSearch = false;
+     const showAdvancedSearch = !showEncryptedSearch || showMore;
+     const showProgress = indexKeyExists(user.ID) && esEnabled && (isBuilding || isRefreshing);
+     const showSubTitleSection = wasIndexingDone(user.ID) && esEnabled && !isRefreshing && isDBLimited;
+
+diff --git a/src/app/containers/EncryptedSearchProvider.tsx b/src/app/containers/EncryptedSearchProvider.tsx
+index 7ba1277..ac4fd64 100644
+--- a/src/app/containers/EncryptedSearchProvider.tsx
++++ b/src/app/containers/EncryptedSearchProvider.tsx
+@@ -527,7 +527,7 @@ const EncryptedSearchProvider = ({ children }: Props) => {
+         const t1 = performance.now();
+         const { dbExists, esEnabled, isCacheReady } = esDBStatus;
+
+-        if (!dbExists || !esEnabled) {
++        if (true) {
+             return false;
+         }
+
diff --git a/src/shared/proton-apps-constants.ts b/src/shared/proton-apps-constants.ts
index 1333a4da3..567e4fcb3 100644
--- a/src/shared/proton-apps-constants.ts
+++ b/src/shared/proton-apps-constants.ts
@@ -21,7 +21,7 @@ export const PROVIDER_REPO_MAP = {
         repoRelativeDistDir: "./dist",
         baseDirName: "",
         repo: "https://github.com/ProtonMail/proton-mail.git",
-        commit: "da1bc2669f7d38b7c79b5e60f9cb3cb56067148c",
+        commit: "4854d1a853720164a4761b907ffc0cde8be8f600",
         protonPack: {
             appConfig: {clientId: "WebMail"},
             webpackIndexEntryItems: [
@@ -50,14 +50,14 @@ export const PROVIDER_REPO_MAP = {
         repoRelativeDistDir: "./dist",
         baseDirName: "account",
         repo: "https://github.com/ProtonMail/proton-account.git",
-        commit: "293da1b9a091ae074489d6152be051a176c4cddd",
+        commit: "8ffe7f8a1afd53b7c4773f1ff34ce222b54515e1",
         protonPack: {appConfig: {clientId: "WebAccount"}}
     },
     [PROVIDER_REPO_NAMES[2]]: {
         repoRelativeDistDir: "./dist",
         baseDirName: "calendar",
         repo: "https://github.com/ProtonMail/proton-calendar.git",
-        commit: "396be94cea2036db15a34f6c192f5d902f5e480d",
+        commit: "64e6414e40dcc7afe9f08fbdcfc9679fd013c6d3",
         protonPack: {
             appConfig: {clientId: "WebCalendar"},
             webpackIndexEntryItems: [
@@ -71,7 +71,7 @@ export const PROVIDER_REPO_MAP = {
         repoRelativeDistDir: "./dist",
         baseDirName: "drive",
         repo: "https://github.com/ProtonMail/proton-drive.git",
-        commit: "05e04a979c35f09f294c9b85a9c79e5ddff04d0c",
+        commit: "1cf15887431fa4d3f1763a36f44f9b21b39b3694",
         protonPack: {appConfig: {clientId: "WebDrive"}},
     },
 } as const;