diff --git a/packages/react/src/components/checkbox/use-checkbox-group-context.tsx b/packages/react/src/components/checkbox/use-checkbox-group-context.tsx
index ea2ab685b5..4435880ec1 100644
--- a/packages/react/src/components/checkbox/use-checkbox-group-context.tsx
+++ b/packages/react/src/components/checkbox/use-checkbox-group-context.tsx
@@ -3,9 +3,7 @@ import type { UseCheckboxGroupReturn } from './use-checkbox-group'
 
 export interface UseCheckboxGroupContext extends UseCheckboxGroupReturn {}
 
-export const [CheckboxGroupContextProvider, useCheckboxGroupContext] = createContext<
-  UseCheckboxGroupContext | undefined
->({
+export const [CheckboxGroupContextProvider, useCheckboxGroupContext] = createContext<UseCheckboxGroupContext>({
   name: 'CheckboxGroupContext',
   hookName: 'useCheckboxGroupContext',
   providerName: '<CheckboxGroupProvider />',
diff --git a/packages/react/src/components/field/examples/custom-control.tsx b/packages/react/src/components/field/examples/custom-control.tsx
index 9fe68b9ecc..ec927234de 100644
--- a/packages/react/src/components/field/examples/custom-control.tsx
+++ b/packages/react/src/components/field/examples/custom-control.tsx
@@ -4,7 +4,7 @@ import styles from 'styles/field.module.css'
 export const CustomControl = () => (
   <Field.Root className={styles.Root} invalid>
     <Field.Label className={styles.Label}>Any Control</Field.Label>
-    <Field.Context>{(context) => <input {...context.getInputProps()} />}</Field.Context>
+    <Field.Context>{(context) => <input {...context?.getInputProps()} />}</Field.Context>
     <Field.HelperText className={styles.HelperText}>Uses getInputProps() for maximum flexibility</Field.HelperText>
     <Field.ErrorText className={styles.ErrorText}>This field has an error</Field.ErrorText>
   </Field.Root>
diff --git a/packages/react/src/components/field/field-context.tsx b/packages/react/src/components/field/field-context.tsx
index 180e5dbfe3..4e229b6e5c 100644
--- a/packages/react/src/components/field/field-context.tsx
+++ b/packages/react/src/components/field/field-context.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react'
-import { type UseFieldContext, useFieldContext } from './use-field-context'
+import { useFieldContext } from './use-field-context'
 
 export interface FieldContextProps {
-  children: (context: UseFieldContext) => ReactNode
+  children: (context: ReturnType<typeof useFieldContext>) => ReactNode
 }
 
 export const FieldContext = (props: FieldContextProps) => props.children(useFieldContext())
diff --git a/packages/react/src/components/field/field-error-text.tsx b/packages/react/src/components/field/field-error-text.tsx
index 158f4bfc7e..b8c5eae38e 100644
--- a/packages/react/src/components/field/field-error-text.tsx
+++ b/packages/react/src/components/field/field-error-text.tsx
@@ -8,7 +8,7 @@ export interface FieldErrorTextProps extends HTMLProps<'span'>, FieldErrorTextBa
 
 export const FieldErrorText = forwardRef<HTMLSpanElement, FieldErrorTextProps>((props, ref) => {
   const field = useFieldContext()
-  const mergedProps = mergeProps(field.getErrorTextProps(), props)
+  const mergedProps = mergeProps(field?.getErrorTextProps(), props)
 
   if (field?.invalid) {
     return <ark.span {...mergedProps} ref={ref} />
diff --git a/packages/react/src/components/field/field-required-indicator.tsx b/packages/react/src/components/field/field-required-indicator.tsx
index 10e097fe54..7a74920198 100644
--- a/packages/react/src/components/field/field-required-indicator.tsx
+++ b/packages/react/src/components/field/field-required-indicator.tsx
@@ -12,11 +12,11 @@ export const FieldRequiredIndicator = forwardRef<HTMLSpanElement, FieldRequiredI
   ({ fallback, ...props }, ref) => {
     const field = useFieldContext()
 
-    if (!field.required) {
+    if (!field?.required) {
       return fallback
     }
 
-    const mergedProps = mergeProps(field.getRequiredIndicatorProps(), props)
+    const mergedProps = mergeProps(field?.getRequiredIndicatorProps(), props)
     return (
       <ark.span {...mergedProps} ref={ref}>
         {props.children ?? '*'}
diff --git a/packages/react/src/components/fieldset/fieldset-context.tsx b/packages/react/src/components/fieldset/fieldset-context.tsx
index acf60d6aa8..895f956e2a 100644
--- a/packages/react/src/components/fieldset/fieldset-context.tsx
+++ b/packages/react/src/components/fieldset/fieldset-context.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react'
-import { type UseFieldsetContext, useFieldsetContext } from './use-fieldset-context'
+import { useFieldsetContext } from './use-fieldset-context'
 
 export interface FieldsetContextProps {
-  children: (context: UseFieldsetContext) => ReactNode
+  children: (context: ReturnType<typeof useFieldsetContext>) => ReactNode
 }
 
 export const FieldsetContext = (props: FieldsetContextProps) => props.children(useFieldsetContext())
diff --git a/packages/react/src/components/fieldset/fieldset-error-text.tsx b/packages/react/src/components/fieldset/fieldset-error-text.tsx
index ceb06abfae..abd24288e9 100644
--- a/packages/react/src/components/fieldset/fieldset-error-text.tsx
+++ b/packages/react/src/components/fieldset/fieldset-error-text.tsx
@@ -8,9 +8,9 @@ export interface FieldsetErrorTextProps extends HTMLProps<'span'>, FieldsetError
 
 export const FieldsetErrorText = forwardRef<HTMLSpanElement, FieldsetErrorTextProps>((props, ref) => {
   const fieldset = useFieldsetContext()
-  const mergedProps = mergeProps(fieldset.getErrorTextProps(), props)
+  const mergedProps = mergeProps(fieldset?.getErrorTextProps(), props)
 
-  return fieldset.invalid ? <ark.span {...mergedProps} ref={ref} /> : null
+  return fieldset?.invalid ? <ark.span {...mergedProps} ref={ref} /> : null
 })
 
 FieldsetErrorText.displayName = 'FieldsetErrorText'
diff --git a/packages/react/src/components/fieldset/fieldset-helper-text.tsx b/packages/react/src/components/fieldset/fieldset-helper-text.tsx
index 322c48463e..5dd4f37bd3 100644
--- a/packages/react/src/components/fieldset/fieldset-helper-text.tsx
+++ b/packages/react/src/components/fieldset/fieldset-helper-text.tsx
@@ -8,7 +8,7 @@ export interface FieldsetHelperTextProps extends HTMLProps<'span'>, FieldsetHelp
 
 export const FieldsetHelperText = forwardRef<HTMLSpanElement, FieldsetHelperTextProps>((props, ref) => {
   const fieldset = useFieldsetContext()
-  const mergedProps = mergeProps(fieldset.getHelperTextProps(), props)
+  const mergedProps = mergeProps(fieldset?.getHelperTextProps(), props)
 
   return <ark.span {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/fieldset/fieldset-legend.tsx b/packages/react/src/components/fieldset/fieldset-legend.tsx
index 63a651bd8d..1aaa0f267b 100644
--- a/packages/react/src/components/fieldset/fieldset-legend.tsx
+++ b/packages/react/src/components/fieldset/fieldset-legend.tsx
@@ -8,7 +8,7 @@ export interface FieldsetLegendProps extends HTMLProps<'legend'>, FieldsetLegend
 
 export const FieldsetLegend = forwardRef<HTMLLegendElement, FieldsetLegendProps>((props, ref) => {
   const fieldset = useFieldsetContext()
-  const mergedProps = mergeProps(fieldset.getLegendProps(), props)
+  const mergedProps = mergeProps(fieldset?.getLegendProps(), props)
 
   return <ark.legend {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-arrow-tip.tsx b/packages/react/src/components/menu/menu-arrow-tip.tsx
index e1388bd75b..2f7f148354 100644
--- a/packages/react/src/components/menu/menu-arrow-tip.tsx
+++ b/packages/react/src/components/menu/menu-arrow-tip.tsx
@@ -8,7 +8,7 @@ export interface MenuArrowTipProps extends HTMLProps<'div'>, MenuArrowTipBasePro
 
 export const MenuArrowTip = forwardRef<HTMLDivElement, MenuArrowTipProps>((props, ref) => {
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getArrowTipProps(), props)
+  const mergedProps = mergeProps(menu?.getArrowTipProps(), props)
 
   return <ark.div {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-arrow.tsx b/packages/react/src/components/menu/menu-arrow.tsx
index 88a472ef7b..c4f6324d05 100644
--- a/packages/react/src/components/menu/menu-arrow.tsx
+++ b/packages/react/src/components/menu/menu-arrow.tsx
@@ -8,7 +8,7 @@ export interface MenuArrowProps extends HTMLProps<'div'>, MenuArrowBaseProps {}
 
 export const MenuArrow = forwardRef<HTMLDivElement, MenuArrowProps>((props, ref) => {
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getArrowProps(), props)
+  const mergedProps = mergeProps(menu?.getArrowProps(), props)
 
   return <ark.div {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-checkbox-item.tsx b/packages/react/src/components/menu/menu-checkbox-item.tsx
index 3c9e4bd330..ebcec131c1 100644
--- a/packages/react/src/components/menu/menu-checkbox-item.tsx
+++ b/packages/react/src/components/menu/menu-checkbox-item.tsx
@@ -28,12 +28,12 @@ export const MenuCheckboxItem = forwardRef<HTMLDivElement, MenuCheckboxItemProps
     type: 'checkbox',
   }
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getOptionItemProps(optionItemProps), localProps)
-  const optionItemState = menu.getOptionItemState(optionItemProps)
+  const mergedProps = mergeProps(menu?.getOptionItemProps(optionItemProps), localProps)
+  const optionItemState = menu?.getOptionItemState(optionItemProps)
 
   return (
     <MenuItemPropsProvider value={optionItemProps}>
-      <MenuItemProvider value={optionItemState}>
+      <MenuItemProvider value={optionItemState!}>
         <ark.div {...mergedProps} ref={ref} />
       </MenuItemProvider>
     </MenuItemPropsProvider>
diff --git a/packages/react/src/components/menu/menu-content.tsx b/packages/react/src/components/menu/menu-content.tsx
index 2039c82572..bae051786e 100644
--- a/packages/react/src/components/menu/menu-content.tsx
+++ b/packages/react/src/components/menu/menu-content.tsx
@@ -11,7 +11,7 @@ export interface MenuContentProps extends HTMLProps<'div'>, MenuContentBaseProps
 export const MenuContent = forwardRef<HTMLDivElement, MenuContentProps>((props, ref) => {
   const menu = useMenuContext()
   const presence = usePresenceContext()
-  const mergedProps = mergeProps(menu.getContentProps(), presence.getPresenceProps(), props)
+  const mergedProps = mergeProps(menu?.getContentProps(), presence.getPresenceProps(), props)
 
   if (presence.unmounted) {
     return null
diff --git a/packages/react/src/components/menu/menu-context-trigger.tsx b/packages/react/src/components/menu/menu-context-trigger.tsx
index 3647dec2ef..b863b7d05f 100644
--- a/packages/react/src/components/menu/menu-context-trigger.tsx
+++ b/packages/react/src/components/menu/menu-context-trigger.tsx
@@ -8,7 +8,7 @@ export interface MenuContextTriggerProps extends HTMLProps<'button'>, MenuContex
 
 export const MenuContextTrigger = forwardRef<HTMLButtonElement, MenuContextTriggerProps>((props, ref) => {
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getContextTriggerProps(), props)
+  const mergedProps = mergeProps(menu?.getContextTriggerProps(), props)
 
   return <ark.button {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-context.tsx b/packages/react/src/components/menu/menu-context.tsx
index 0ac85f16a6..05563adafc 100644
--- a/packages/react/src/components/menu/menu-context.tsx
+++ b/packages/react/src/components/menu/menu-context.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react'
-import { type UseMenuContext, useMenuContext } from './use-menu-context'
+import { useMenuContext } from './use-menu-context'
 
 export interface MenuContextProps {
-  children: (context: UseMenuContext) => ReactNode
+  children: (context: ReturnType<typeof useMenuContext>) => ReactNode
 }
 
 export const MenuContext = (props: MenuContextProps) => props.children(useMenuContext())
diff --git a/packages/react/src/components/menu/menu-indicator.tsx b/packages/react/src/components/menu/menu-indicator.tsx
index 21a4f33a44..b6dc65938e 100644
--- a/packages/react/src/components/menu/menu-indicator.tsx
+++ b/packages/react/src/components/menu/menu-indicator.tsx
@@ -8,7 +8,7 @@ export interface MenuIndicatorProps extends HTMLProps<'div'>, MenuIndicatorBaseP
 
 export const MenuIndicator = forwardRef<HTMLDivElement, MenuIndicatorProps>((props, ref) => {
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getIndicatorProps(), props)
+  const mergedProps = mergeProps(menu?.getIndicatorProps(), props)
 
   return <ark.div {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-item-group-label.tsx b/packages/react/src/components/menu/menu-item-group-label.tsx
index 1c8c892472..14fa7b8933 100644
--- a/packages/react/src/components/menu/menu-item-group-label.tsx
+++ b/packages/react/src/components/menu/menu-item-group-label.tsx
@@ -10,7 +10,7 @@ export interface MenuItemGroupLabelProps extends HTMLProps<'div'>, MenuItemGroup
 export const MenuItemGroupLabel = forwardRef<HTMLDivElement, MenuItemGroupLabelProps>((props, ref) => {
   const menu = useMenuContext()
   const itemGroup = useMenuItemGroupContext()
-  const mergedProps = mergeProps(menu.getItemGroupLabelProps({ htmlFor: itemGroup.id }), props)
+  const mergedProps = mergeProps(menu?.getItemGroupLabelProps({ htmlFor: itemGroup.id }), props)
 
   return <ark.div {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-item-group.tsx b/packages/react/src/components/menu/menu-item-group.tsx
index 187fbd49a5..a45de816eb 100644
--- a/packages/react/src/components/menu/menu-item-group.tsx
+++ b/packages/react/src/components/menu/menu-item-group.tsx
@@ -19,7 +19,7 @@ export const MenuItemGroup = forwardRef<HTMLDivElement, MenuItemGroupProps>((pro
   const menu = useMenuContext()
   const id = useId()
   const itemGroupProps = { id, ...optionalItemGroupProps }
-  const mergedProps = mergeProps(menu.getItemGroupProps(itemGroupProps), localProps)
+  const mergedProps = mergeProps(menu?.getItemGroupProps(itemGroupProps), localProps)
 
   return (
     <MenuItemGroupProvider value={itemGroupProps}>
diff --git a/packages/react/src/components/menu/menu-item-indicator.tsx b/packages/react/src/components/menu/menu-item-indicator.tsx
index f14044a874..89cf0a7b29 100644
--- a/packages/react/src/components/menu/menu-item-indicator.tsx
+++ b/packages/react/src/components/menu/menu-item-indicator.tsx
@@ -10,7 +10,7 @@ export interface MenuItemIndicatorProps extends HTMLProps<'div'>, MenuItemIndica
 export const MenuItemIndicator = forwardRef<HTMLDivElement, MenuItemIndicatorProps>((props, ref) => {
   const menu = useMenuContext()
   const itemProps = useMenuItemPropsContext()
-  const mergedProps = mergeProps(menu.getItemIndicatorProps(itemProps), props)
+  const mergedProps = mergeProps(menu?.getItemIndicatorProps(itemProps), props)
 
   return <ark.div {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-item-text.tsx b/packages/react/src/components/menu/menu-item-text.tsx
index 28ac751a69..873f14fea3 100644
--- a/packages/react/src/components/menu/menu-item-text.tsx
+++ b/packages/react/src/components/menu/menu-item-text.tsx
@@ -10,7 +10,7 @@ export interface MenuItemTextProps extends HTMLProps<'div'>, MenuItemTextBasePro
 export const MenuItemText = forwardRef<HTMLDivElement, MenuItemTextProps>((props, ref) => {
   const menu = useMenuContext()
   const itemProps = useMenuItemPropsContext()
-  const mergedProps = mergeProps(menu.getItemTextProps(itemProps), props)
+  const mergedProps = mergeProps(menu?.getItemTextProps(itemProps), props)
 
   return <ark.div {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-item.tsx b/packages/react/src/components/menu/menu-item.tsx
index c049000ada..e388ddee15 100644
--- a/packages/react/src/components/menu/menu-item.tsx
+++ b/packages/react/src/components/menu/menu-item.tsx
@@ -31,17 +31,18 @@ export const MenuItem = forwardRef<HTMLDivElement, MenuItemProps>((props, ref) =
   ])
 
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getItemProps(itemProps), localProps)
-  const itemState = menu.getItemState(itemProps)
+  const mergedProps = mergeProps(menu?.getItemProps(itemProps), localProps)
+  const itemState = menu?.getItemState(itemProps)
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
   useEffect(() => {
-    return menu.addItemListener({ id: itemState.id, onSelect: itemProps.onSelect })
-  }, [itemState.id, itemProps.onSelect])
+    if (!itemState?.id) return
+    return menu?.addItemListener({ id: itemState.id, onSelect: itemProps.onSelect })
+  }, [itemState?.id, itemProps.onSelect])
 
   return (
     <MenuItemPropsProvider value={itemProps}>
-      <MenuItemProvider value={itemState}>
+      <MenuItemProvider value={itemState!}>
         <ark.div {...mergedProps} ref={ref} />
       </MenuItemProvider>
     </MenuItemPropsProvider>
diff --git a/packages/react/src/components/menu/menu-positioner.tsx b/packages/react/src/components/menu/menu-positioner.tsx
index 4aa233326f..995ce0df41 100644
--- a/packages/react/src/components/menu/menu-positioner.tsx
+++ b/packages/react/src/components/menu/menu-positioner.tsx
@@ -9,7 +9,7 @@ export interface MenuPositionerProps extends HTMLProps<'div'>, MenuPositionerBas
 
 export const MenuPositioner = forwardRef<HTMLDivElement, MenuPositionerProps>((props, ref) => {
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getPositionerProps(), props)
+  const mergedProps = mergeProps(menu?.getPositionerProps(), props)
   const presence = usePresenceContext()
 
   if (presence.unmounted) {
diff --git a/packages/react/src/components/menu/menu-radio-item-group.tsx b/packages/react/src/components/menu/menu-radio-item-group.tsx
index 84ec342932..cae303b294 100644
--- a/packages/react/src/components/menu/menu-radio-item-group.tsx
+++ b/packages/react/src/components/menu/menu-radio-item-group.tsx
@@ -18,7 +18,7 @@ export const MenuRadioItemGroup = forwardRef<HTMLDivElement, MenuRadioItemGroupP
   const menu = useMenuContext()
   const id = useId()
   const itemGroupProps = { id, ...optionalItemGroupProps }
-  const mergedProps = mergeProps(menu.getItemGroupProps({ id: itemGroupProps.id }), localProps)
+  const mergedProps = mergeProps(menu?.getItemGroupProps({ id: itemGroupProps.id }), localProps)
 
   return (
     <MenuItemGroupProvider value={itemGroupProps}>
diff --git a/packages/react/src/components/menu/menu-radio-item.tsx b/packages/react/src/components/menu/menu-radio-item.tsx
index 6089c14e19..38f90ee39c 100644
--- a/packages/react/src/components/menu/menu-radio-item.tsx
+++ b/packages/react/src/components/menu/menu-radio-item.tsx
@@ -30,12 +30,12 @@ export const MenuRadioItem = forwardRef<HTMLDivElement, MenuRadioItemProps>((pro
     type: 'radio',
     onCheckedChange: () => itemGroup.onValueChange?.({ value: partialItemProps.value }),
   }
-  const mergedProps = mergeProps(menu.getOptionItemProps(optionItemProps), localProps)
-  const optionItemState = menu.getOptionItemState(optionItemProps)
+  const mergedProps = mergeProps(menu?.getOptionItemProps(optionItemProps), localProps)
+  const optionItemState = menu?.getOptionItemState(optionItemProps)
 
   return (
     <MenuItemPropsProvider value={optionItemProps}>
-      <MenuItemProvider value={optionItemState}>
+      <MenuItemProvider value={optionItemState!}>
         <ark.div {...mergedProps} ref={ref} />
       </MenuItemProvider>
     </MenuItemPropsProvider>
diff --git a/packages/react/src/components/menu/menu-separator.tsx b/packages/react/src/components/menu/menu-separator.tsx
index 17f8c71b00..ec7a192370 100644
--- a/packages/react/src/components/menu/menu-separator.tsx
+++ b/packages/react/src/components/menu/menu-separator.tsx
@@ -8,7 +8,7 @@ export interface MenuSeparatorProps extends HTMLProps<'hr'>, MenuSeparatorBasePr
 
 export const MenuSeparator = forwardRef<HTMLHRElement, MenuSeparatorProps>((props, ref) => {
   const menu = useMenuContext()
-  const mergedProps = mergeProps(menu.getSeparatorProps(), props)
+  const mergedProps = mergeProps(menu?.getSeparatorProps(), props)
 
   return <ark.hr {...mergedProps} ref={ref} />
 })
diff --git a/packages/react/src/components/menu/menu-trigger.tsx b/packages/react/src/components/menu/menu-trigger.tsx
index eba555994b..bb0ae23205 100644
--- a/packages/react/src/components/menu/menu-trigger.tsx
+++ b/packages/react/src/components/menu/menu-trigger.tsx
@@ -12,8 +12,8 @@ export const MenuTrigger = forwardRef<HTMLButtonElement, MenuTriggerProps>((prop
   const presence = usePresenceContext()
   const mergedProps = mergeProps(
     {
-      ...menu.getTriggerProps(),
-      'aria-controls': presence.unmounted ? undefined : menu.getTriggerProps()['aria-controls'],
+      ...menu?.getTriggerProps(),
+      'aria-controls': presence.unmounted ? undefined : menu?.getTriggerProps()['aria-controls'],
     },
     props,
   )
diff --git a/packages/react/src/components/navigation-menu/navigation-menu-content.tsx b/packages/react/src/components/navigation-menu/navigation-menu-content.tsx
index 15dac76b47..0a7cc7a3bc 100644
--- a/packages/react/src/components/navigation-menu/navigation-menu-content.tsx
+++ b/packages/react/src/components/navigation-menu/navigation-menu-content.tsx
@@ -21,7 +21,7 @@ export const NavigationMenuContent = forwardRef<HTMLDivElement, NavigationMenuCo
   const itemContext = useNavigationMenuItemPropsContext()
 
   const value = props.value ?? itemContext?.value
-  const [contentProps, localProps] = splitContentProps({ ...props, value }, ['value'])
+  const [contentProps, localProps] = splitContentProps({ ...props, value: value! }, ['value'])
 
   const renderStrategyProps = useRenderStrategyPropsContext()
   const presence = usePresence({ ...renderStrategyProps, present: api.value === value })
diff --git a/packages/react/src/components/navigation-menu/navigation-menu-item-indicator.tsx b/packages/react/src/components/navigation-menu/navigation-menu-item-indicator.tsx
index 00b6435bb3..bf5d57f323 100644
--- a/packages/react/src/components/navigation-menu/navigation-menu-item-indicator.tsx
+++ b/packages/react/src/components/navigation-menu/navigation-menu-item-indicator.tsx
@@ -11,7 +11,7 @@ export const NavigationMenuItemIndicator = forwardRef<HTMLDivElement, Navigation
   (props, ref) => {
     const navigationMenu = useNavigationMenuContext()
     const itemProps = useNavigationMenuItemPropsContext()
-    const mergedProps = mergeProps(navigationMenu.getItemIndicatorProps(itemProps), props)
+    const mergedProps = mergeProps(navigationMenu.getItemIndicatorProps(itemProps!), props)
 
     return <ark.div {...mergedProps} ref={ref} />
   },
diff --git a/packages/react/src/components/navigation-menu/navigation-menu-link.tsx b/packages/react/src/components/navigation-menu/navigation-menu-link.tsx
index 5308eeaaf7..33ee47c3ca 100644
--- a/packages/react/src/components/navigation-menu/navigation-menu-link.tsx
+++ b/packages/react/src/components/navigation-menu/navigation-menu-link.tsx
@@ -16,7 +16,12 @@ export const NavigationMenuLink = forwardRef<HTMLAnchorElement, NavigationMenuLi
   const itemContext = useNavigationMenuItemPropsContext()
   const value = props.value ?? itemContext?.value
 
-  const [linkProps, localProps] = splitLinkProps({ ...props, value }, ['current', 'onSelect', 'value', 'closeOnClick'])
+  const [linkProps, localProps] = splitLinkProps({ ...props, value: value! }, [
+    'current',
+    'onSelect',
+    'value',
+    'closeOnClick',
+  ])
   const navigationMenu = useNavigationMenuContext()
   const mergedProps = mergeProps(navigationMenu.getLinkProps(linkProps), localProps)
 
diff --git a/packages/react/src/utils/create-context.ts b/packages/react/src/utils/create-context.ts
index 7d56cec5df..fea3c84152 100644
--- a/packages/react/src/utils/create-context.ts
+++ b/packages/react/src/utils/create-context.ts
@@ -1,6 +1,10 @@
 import { hasProp, isFunction } from '@zag-js/utils'
 import { createContext as createReactContext, useContext as useReactContext } from 'react'
 
+function getErrorMessage(hook: string, provider: string) {
+  return `${hook} returned \`undefined\`. Seems you forgot to wrap component within ${provider}`
+}
+
 interface CreateContextOptions<T> {
   strict?: boolean | undefined
   hookName?: string | undefined
@@ -10,11 +14,19 @@ interface CreateContextOptions<T> {
   defaultValue?: T | undefined
 }
 
-type CreateContextReturn<T> = [React.Provider<T>, () => T, React.Context<T>]
+type CreateContextReturn<T, HasValue extends boolean> = [
+  React.Provider<T>,
+  HasValue extends true ? () => T : () => T | undefined,
+  HasValue extends true ? React.Context<T> : React.Context<T | undefined>,
+]
 
-function getErrorMessage(hook: string, provider: string) {
-  return `${hook} returned \`undefined\`. Seems you forgot to wrap component within ${provider}`
-}
+export function createContext<T>(options?: CreateContextOptions<T> & { strict?: true }): CreateContextReturn<T, true>
+
+export function createContext<T>(
+  options: CreateContextOptions<T> & { strict: false; defaultValue: T },
+): CreateContextReturn<T, true>
+
+export function createContext<T>(options: CreateContextOptions<T> & { strict: false }): CreateContextReturn<T, false>
 
 export function createContext<T>(options: CreateContextOptions<T> = {}) {
   const {
@@ -45,5 +57,5 @@ export function createContext<T>(options: CreateContextOptions<T> = {}) {
     return context
   }
 
-  return [Context.Provider, useContext, Context] as CreateContextReturn<T>
+  return [Context.Provider, useContext, Context] as any
 }