diff --git a/packages/mui-base/src/ScrollArea/Root/ScrollAreaRootContext.ts b/packages/mui-base/src/ScrollArea/Root/ScrollAreaRootContext.ts
index fd9ef6349..93de23600 100644
--- a/packages/mui-base/src/ScrollArea/Root/ScrollAreaRootContext.ts
+++ b/packages/mui-base/src/ScrollArea/Root/ScrollAreaRootContext.ts
@@ -21,7 +21,9 @@ export interface ScrollAreaRootContext {
   handlePointerUp: (event: React.PointerEvent) => void;
 }
 
-export const ScrollAreaRootContext = React.createContext<ScrollAreaRootContext | null>(null);
+export const ScrollAreaRootContext = React.createContext<ScrollAreaRootContext | undefined>(
+  undefined,
+);
 
 if (process.env.NODE_ENV !== 'production') {
   ScrollAreaRootContext.displayName = 'ScrollAreaRootContext';
@@ -29,7 +31,7 @@ if (process.env.NODE_ENV !== 'production') {
 
 export function useScrollAreaRootContext() {
   const context = React.useContext(ScrollAreaRootContext);
-  if (context === null) {
+  if (context === undefined) {
     throw new Error('Base UI: ScrollAreaRootContext is undefined.');
   }
   return context;
diff --git a/packages/mui-base/src/ScrollArea/Scrollbar/ScrollAreaScrollbarContext.ts b/packages/mui-base/src/ScrollArea/Scrollbar/ScrollAreaScrollbarContext.ts
index 658c780d4..f24e6edc8 100644
--- a/packages/mui-base/src/ScrollArea/Scrollbar/ScrollAreaScrollbarContext.ts
+++ b/packages/mui-base/src/ScrollArea/Scrollbar/ScrollAreaScrollbarContext.ts
@@ -4,9 +4,9 @@ export interface ScrollAreaScrollbarContext {
   orientation: 'horizontal' | 'vertical';
 }
 
-export const ScrollAreaScrollbarContext = React.createContext<ScrollAreaScrollbarContext | null>(
-  null,
-);
+export const ScrollAreaScrollbarContext = React.createContext<
+  ScrollAreaScrollbarContext | undefined
+>(undefined);
 
 if (process.env.NODE_ENV !== 'production') {
   ScrollAreaScrollbarContext.displayName = 'ScrollAreaScrollbarContext';
@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== 'production') {
 
 export function useScrollAreaScrollbarContext() {
   const context = React.useContext(ScrollAreaScrollbarContext);
-  if (context === null) {
+  if (context === undefined) {
     throw new Error('Base UI: ScrollAreaScrollbarContext is undefined.');
   }
   return context;