diff --git a/package.json b/package.json
index 32efd6a0b09..5f8ad70c8e1 100644
--- a/package.json
+++ b/package.json
@@ -307,7 +307,7 @@
     "react-visibility-sensor": "^5.1.1",
     "reactstrap": "^8.4.1",
     "recharts": "^1.8.5",
-    "rxjs": "^6.6.0",
+    "rxjs": "^6.6.2",
     "sanitize-html": "^1.26.0",
     "semver": "^7.3.2",
     "slugify": "^1.4.4",
diff --git a/shared/src/api/client/api/common.ts b/shared/src/api/client/api/common.ts
index 5491e824fcc..329a2ae6e40 100644
--- a/shared/src/api/client/api/common.ts
+++ b/shared/src/api/client/api/common.ts
@@ -22,10 +22,6 @@ export class ProxySubscription extends Subscription {
     constructor(proxy: Pick<ProxyMethods, typeof releaseProxy>) {
         super(() => {
             proxy[releaseProxy]()
-
-            // Workaround for https://github.com/ReactiveX/rxjs/issues/5464
-            // Remove when fixed
-            ;(this as any)._unsubscribe = null
         })
     }
 }
diff --git a/shared/src/api/util.ts b/shared/src/api/util.ts
index 6a762b2f018..386fdcf6784 100644
--- a/shared/src/api/util.ts
+++ b/shared/src/api/util.ts
@@ -37,13 +37,10 @@ export function registerComlinkTransferHandlers(): void {
 export const syncSubscription = (subscriptionPromise: Promise<Remote<Unsubscribable & ProxyMarked>>): Subscription =>
     // We cannot pass the proxy subscription directly to Rx because it is a Proxy that looks like a function
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    new Subscription(async function (this: any) {
+    new Subscription(async () => {
         const subscriptionProxy = await subscriptionPromise
         await subscriptionProxy.unsubscribe()
         subscriptionProxy[releaseProxy]()
-
-        this._unsubscribe = null // Workaround: rxjs doesn't null out the reference to this callback
-        ;(subscriptionPromise as any) = null
     })
 
 /**
diff --git a/yarn.lock b/yarn.lock
index 72572adcebc..899b6b753b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2608,8 +2608,7 @@
   integrity sha512-KWxkyphmlwam8kfYPSmoitKQRMGQCsr1ZRmNZgijT7ABKaVyk/+I5ezt2J213tM04Hi0vyg4L7iH1VCkNvm2Jw==
 
 "@sourcegraph/extension-api-types@link:packages/@sourcegraph/extension-api-types":
-  version "0.0.0"
-  uid ""
+  version "2.1.0"
 
 "@sourcegraph/prettierrc@^3.0.3":
   version "3.0.3"
@@ -20002,10 +20001,10 @@ rxjs-report-usage@^1.0.4:
     glob "~7.1.6"
     prompts "~2.3.2"
 
-rxjs@^6.3.2, rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.5.5, rxjs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
-  integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
+rxjs@^6.3.2, rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.5.5, rxjs@^6.6.2:
+  version "6.6.2"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
   dependencies:
     tslib "^1.9.0"
 
@@ -20824,8 +20823,7 @@ sourcegraph@^24.0.0:
   integrity sha512-PlGvkdBy5r5iHdKAVNY/jsPgWb3oY+2iAdIQ3qR83UHhvBFVgoctDAnyfJ1eMstENY3etBWtAJ8Kleoar3ecaA==
 
 "sourcegraph@link:packages/sourcegraph-extension-api":
-  version "0.0.0"
-  uid ""
+  version "24.7.0"
 
 space-separated-tokens@^1.0.0:
   version "1.1.2"