diff --git a/src/app/loadout-analyzer/hooks.tsx b/src/app/loadout-analyzer/hooks.tsx
index faf07002c6..6c1847641e 100644
--- a/src/app/loadout-analyzer/hooks.tsx
+++ b/src/app/loadout-analyzer/hooks.tsx
@@ -17,8 +17,8 @@ import { useLoadVendors } from 'app/vendors/hooks';
 import {
   ReactNode,
   createContext,
+  use,
   useCallback,
-  useContext,
   useEffect,
   useId,
   useState,
@@ -99,7 +99,7 @@ export function MakeLoadoutAnalysisAvailable({ children }: { children: ReactNode
  */
 export function useUpdateLoadoutAnalysisContext(storeId: string) {
   const account = useSelector(currentAccountSelector)!;
-  const analyzer = useContext(LoadoutAnalyzerReactContext);
+  const analyzer = use(LoadoutAnalyzerReactContext);
   const analysisContext = useSelector(autoOptimizationContextSelector(storeId));
 
   useLoadVendors(account, storeId);
@@ -122,7 +122,7 @@ export function useAnalyzeLoadout(
     }
   | undefined {
   const id = useId();
-  const analyzer = useContext(LoadoutAnalyzerReactContext);
+  const analyzer = use(LoadoutAnalyzerReactContext);
   const subscribe = useCallback(
     (callback: () => void) =>
       active && analyzer
@@ -144,7 +144,7 @@ export function useSummaryLoadoutsAnalysis(
   active: boolean,
 ): LoadoutAnalysisSummary | undefined {
   const id = useId();
-  const analyzer = useContext(LoadoutAnalyzerReactContext);
+  const analyzer = use(LoadoutAnalyzerReactContext);
   const subscribe = useCallback(
     (callback: () => void) =>
       active && analyzer
diff --git a/src/app/vendors/VendorItemComponent.tsx b/src/app/vendors/VendorItemComponent.tsx
index 310dfd2ece..634154563a 100644
--- a/src/app/vendors/VendorItemComponent.tsx
+++ b/src/app/vendors/VendorItemComponent.tsx
@@ -4,7 +4,7 @@ import { ItemPopupExtraInfo } from 'app/item-popup/item-popup';
 import { DestinyCollectibleState } from 'bungie-api-ts/destiny2';
 import clsx from 'clsx';
 import { ItemCategoryHashes } from 'data/d2/generated-enums';
-import React, { useContext } from 'react';
+import React, { use } from 'react';
 import BungieImage from '../dim-ui/BungieImage';
 import ConnectedInventoryItem from '../inventory/ConnectedInventoryItem';
 import ItemPopupTrigger from '../inventory/ItemPopupTrigger';
@@ -24,8 +24,8 @@ export default function VendorItemComponent({
   owned: boolean;
   characterId?: string;
 }) {
-  const showVendor = useContext(SingleVendorSheetContext);
   if (item.displayTile) {
+    const showVendor = use(SingleVendorSheetContext);
     return (
       <div className={styles.vendorItem}>
         <a onClick={() => showVendor?.({ characterId, vendorHash: item.previewVendorHash })}>