diff --git a/apps/web/jest.config.ts b/apps/web/jest.config.ts
index b01778758a1..31d08dc36e9 100644
--- a/apps/web/jest.config.ts
+++ b/apps/web/jest.config.ts
@@ -48,7 +48,7 @@ const config: Config = {
         "@vector-im/compound-web": "<rootDir>/node_modules/@vector-im/compound-web",
     },
     transformIgnorePatterns: [
-        `${path.join(__dirname, "../..")}/node_modules/.pnpm/(?!(mime|uuid|p-retry|is-network-error|react-merge-refs|is-ip|ip-regex|super-regex|function-timeout|time-span|convert-hrtime|clone-regexp|is-regexp|matrix-web-i18n|await-lock|@element-hq/web-shared-components|react-virtuoso|lodash|domutils|domhandler|domelementtype|dom-serializer|entities)).+$`,
+        `${path.join(__dirname, "../..")}/node_modules/.pnpm/(?!(mime|uuid|p-retry|is-network-error|react-merge-refs|is-ip|ip-regex|super-regex|function-timeout|time-span|convert-hrtime|clone-regexp|is-regexp|matrix-web-i18n|await-lock|@element-hq/web-shared-components|react-virtuoso|lodash|domutils|domhandler|domelementtype|dom-serializer|entities|matrix-js-sdk)).+$`,
     ],
     collectCoverageFrom: [
         "<rootDir>/src/**/*.{js,ts,tsx}",
diff --git a/apps/web/package.json b/apps/web/package.json
index ac2b693d27a..e95ca5bcadb 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -84,7 +84,7 @@
         "lodash": "npm:lodash-es@4.18.1",
         "maplibre-gl": "^5.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#33e4db98814edb1e100ac8b9721cf84de998f429",
         "matrix-widget-api": "^1.16.1",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",
@@ -131,6 +131,7 @@
         "@element-hq/element-web-playwright-common": "workspace:*",
         "@fetch-mock/jest": "^0.2.20",
         "@jest/globals": "^30.2.0",
+        "@matrix-org/matrix-sdk-crypto-wasm": "^18.3.1",
         "@peculiar/webcrypto": "^1.4.3",
         "@playwright/test": "catalog:",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
diff --git a/apps/web/playwright/tsconfig.json b/apps/web/playwright/tsconfig.json
index 85ab919b487..b70a311db4e 100644
--- a/apps/web/playwright/tsconfig.json
+++ b/apps/web/playwright/tsconfig.json
@@ -15,7 +15,6 @@
     "include": [
         "**/*.ts",
         "../src/@types/matrix-js-sdk.d.ts",
-        "../node_modules/matrix-js-sdk/src/@types/*.d.ts",
-        "../node_modules/matrix-js-sdk/node_modules/@matrix-org/olm/index.d.ts"
+        "../node_modules/matrix-js-sdk/src/@types/*.d.ts"
     ]
 }
diff --git a/docs/generated/[id].paths.ts b/docs/generated/[id].paths.ts
index 58531ec8bd5..9819edd5a1d 100644
--- a/docs/generated/[id].paths.ts
+++ b/docs/generated/[id].paths.ts
@@ -11,7 +11,7 @@ export default {
         return [
             {
                 params: { id: "automations" },
-                content: await genWorkflowMermaid([root, join(root, "node_modules", "matrix-js-sdk")]),
+                content: await genWorkflowMermaid([root]),
             },
         ];
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a50e46ec97e..eed559c428a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -650,7 +650,7 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       matrix-js-sdk:
-        specifier: github:matrix-org/matrix-js-sdk#develop
+        specifier: github:matrix-org/matrix-js-sdk#33e4db98814edb1e100ac8b9721cf84de998f429
         version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/33e4db98814edb1e100ac8b9721cf84de998f429
       matrix-widget-api:
         specifier: ^1.17.0
@@ -785,6 +785,9 @@ importers:
       '@jest/globals':
         specifier: ^30.2.0
         version: 30.4.1
+      '@matrix-org/matrix-sdk-crypto-wasm':
+        specifier: ^18.3.1
+        version: 18.3.1
       '@peculiar/webcrypto':
         specifier: ^1.4.3
         version: 1.7.1
@@ -4070,6 +4073,7 @@ packages:
   '@opentelemetry/sdk-trace-base@2.7.1':
     resolution: {integrity: sha512-NAYIlsF8MPUsKqJMiDQJTMPOmlbawC1Iz/omMLygZ1C9am8fTKYjTaI+OZM+WTY3t3Glo0wnOg/6/pac6RGPPw==}
     engines: {node: ^18.19.0 || >=20.6.0}
+    deprecated: Use @opentelemetry/sdk-trace package
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
@@ -6604,6 +6608,7 @@ packages:
   '@xmldom/xmldom@0.8.13':
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
+    deprecated: this version has critical issues, please update to the latest version
 
   '@xtuc/ieee754@1.2.0':
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
@@ -10053,6 +10058,7 @@ packages:
 
   jsrsasign@11.1.3:
     resolution: {integrity: sha512-nPnK5D/4lv0Dwr7TlzrKtAd8JlLZwFTqTUUB3NQCbtdobcRcohGFxjbPySDVh74iWUudcCsapYT6OxoyhJLhhA==}
+    deprecated: This package is no longer maintained.
 
   jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
diff --git a/scripts/layered.sh b/scripts/layered.sh
index 912ef56a32a..50027aa4709 100755
--- a/scripts/layered.sh
+++ b/scripts/layered.sh
@@ -36,5 +36,9 @@ if [ "$js_sdk_dep" = "github:matrix-org/matrix-js-sdk#develop" ]; then
     pnpm -C apps/web link ./matrix-js-sdk
     pnpm link ./matrix-js-sdk
 else
+    if [ -n "$JS_SDK_GITHUB_BASE_REF" ]; then
+        echo "ERROR: JS_SDK_GITHUB_BASE_REF ($JS_SDK_GITHUB_BASE_REF) was requested, but package.json pins matrix-js-sdk to $js_sdk_dep, so it would be ignored." >&2
+        exit 1
+    fi
     echo "Skipping matrix-js-sdk fetch and link as package.json pins $js_sdk_dep"
 fi