diff --git a/.changeset/grumpy-maps-shave.md b/.changeset/grumpy-maps-shave.md
new file mode 100644
index 00000000000..2bd49b0acb2
--- /dev/null
+++ b/.changeset/grumpy-maps-shave.md
@@ -0,0 +1,7 @@
+---
+'@primer/react': patch
+---
+
+Update type exports to prevent missing export warnings
+
+<!-- Changed components: _none_ -->
diff --git a/src/Avatar/index.ts b/src/Avatar/index.ts
index 3416ace8bb9..9a8c68b5d11 100644
--- a/src/Avatar/index.ts
+++ b/src/Avatar/index.ts
@@ -1 +1,2 @@
-export {default, AvatarProps} from './Avatar'
+export {default} from './Avatar'
+export type {AvatarProps} from './Avatar'
diff --git a/src/AvatarPair/index.ts b/src/AvatarPair/index.ts
index c76e82e6f83..fecf389776b 100644
--- a/src/AvatarPair/index.ts
+++ b/src/AvatarPair/index.ts
@@ -1 +1,2 @@
-export {default, AvatarPairProps} from './AvatarPair'
+export {default} from './AvatarPair'
+export type {AvatarPairProps} from './AvatarPair'
diff --git a/src/AvatarStack/index.ts b/src/AvatarStack/index.ts
index 087c316adfd..f8fcbb1479d 100644
--- a/src/AvatarStack/index.ts
+++ b/src/AvatarStack/index.ts
@@ -1 +1,2 @@
-export {default, AvatarStackProps} from './AvatarStack'
+export {default} from './AvatarStack'
+export type {AvatarStackProps} from './AvatarStack'
diff --git a/src/Blankslate/index.tsx b/src/Blankslate/index.tsx
index 253bb45abf8..6fe7d0736c2 100644
--- a/src/Blankslate/index.tsx
+++ b/src/Blankslate/index.tsx
@@ -1 +1,2 @@
-export {default as Blankslate, BlankslateProps} from './Blankslate'
+export {default as Blankslate} from './Blankslate'
+export type {BlankslateProps} from './Blankslate'
diff --git a/src/Box/index.ts b/src/Box/index.ts
index 199edfb05bb..136edb00d51 100644
--- a/src/Box/index.ts
+++ b/src/Box/index.ts
@@ -1 +1,2 @@
-export {default, BoxProps} from './Box'
+export {default} from './Box'
+export type {BoxProps} from './Box'
diff --git a/src/BranchName/index.ts b/src/BranchName/index.ts
index d4c9c05b7c7..7c3b15cc0d7 100644
--- a/src/BranchName/index.ts
+++ b/src/BranchName/index.ts
@@ -1 +1,2 @@
-export {default, BranchNameProps} from './BranchName'
+export {default} from './BranchName'
+export type {BranchNameProps} from './BranchName'
diff --git a/src/Breadcrumbs/index.ts b/src/Breadcrumbs/index.ts
index 6a091cf9522..1e65b108770 100644
--- a/src/Breadcrumbs/index.ts
+++ b/src/Breadcrumbs/index.ts
@@ -1,8 +1,2 @@
-export {
-  default,
-  Breadcrumb,
-  BreadcrumbsProps,
-  BreadcrumbProps,
-  BreadcrumbsItemProps,
-  BreadcrumbItemProps,
-} from './Breadcrumbs'
+export {default, Breadcrumb} from './Breadcrumbs'
+export type {BreadcrumbsProps, BreadcrumbProps, BreadcrumbsItemProps, BreadcrumbItemProps} from './Breadcrumbs'
diff --git a/src/ButtonGroup/index.ts b/src/ButtonGroup/index.ts
index 33777d2c3bf..67256e5093c 100644
--- a/src/ButtonGroup/index.ts
+++ b/src/ButtonGroup/index.ts
@@ -1 +1,2 @@
-export {default, ButtonGroupProps} from './ButtonGroup'
+export {default} from './ButtonGroup'
+export type {ButtonGroupProps} from './ButtonGroup'
diff --git a/src/Checkbox/index.ts b/src/Checkbox/index.ts
index 2c5614cd6a3..5bc9be9edd6 100644
--- a/src/Checkbox/index.ts
+++ b/src/Checkbox/index.ts
@@ -1 +1,2 @@
-export {default, CheckboxProps} from './Checkbox'
+export {default} from './Checkbox'
+export type {CheckboxProps} from './Checkbox'
diff --git a/src/CircleBadge/index.ts b/src/CircleBadge/index.ts
index 671c4e97089..753cffb95c2 100644
--- a/src/CircleBadge/index.ts
+++ b/src/CircleBadge/index.ts
@@ -1 +1,2 @@
-export {default, CircleBadgeProps, CircleBadgeIconProps} from './CircleBadge'
+export {default} from './CircleBadge'
+export type {CircleBadgeProps, CircleBadgeIconProps} from './CircleBadge'
diff --git a/src/CircleOcticon/index.ts b/src/CircleOcticon/index.ts
index 493e588157e..e3e77695425 100644
--- a/src/CircleOcticon/index.ts
+++ b/src/CircleOcticon/index.ts
@@ -1 +1,2 @@
-export {default, CircleOcticonProps} from './CircleOcticon'
+export {default} from './CircleOcticon'
+export type {CircleOcticonProps} from './CircleOcticon'
diff --git a/src/CounterLabel/index.ts b/src/CounterLabel/index.ts
index 0d6b5cef6e6..88c01245e4a 100644
--- a/src/CounterLabel/index.ts
+++ b/src/CounterLabel/index.ts
@@ -1 +1,2 @@
-export {default, CounterLabelProps} from './CounterLabel'
+export {default} from './CounterLabel'
+export type {CounterLabelProps} from './CounterLabel'
diff --git a/src/Details/index.ts b/src/Details/index.ts
index 942b90c1340..bfa6296c530 100644
--- a/src/Details/index.ts
+++ b/src/Details/index.ts
@@ -1 +1,2 @@
-export {default, DetailsProps} from './Details'
+export {default} from './Details'
+export type {DetailsProps} from './Details'
diff --git a/src/FilterList/index.ts b/src/FilterList/index.ts
index 967ba6cf4af..4788f9e25ab 100644
--- a/src/FilterList/index.ts
+++ b/src/FilterList/index.ts
@@ -1 +1,2 @@
-export {default, FilterListProps, FilterListItemProps} from './FilterList'
+export {default} from './FilterList'
+export type {FilterListProps, FilterListItemProps} from './FilterList'
diff --git a/src/FilteredSearch/index.ts b/src/FilteredSearch/index.ts
index 759088b2fe8..c359330d386 100644
--- a/src/FilteredSearch/index.ts
+++ b/src/FilteredSearch/index.ts
@@ -1 +1,2 @@
-export {default, FilteredSearchProps} from './FilteredSearch'
+export {default} from './FilteredSearch'
+export type {FilteredSearchProps} from './FilteredSearch'
diff --git a/src/Flash/index.ts b/src/Flash/index.ts
index a577be81af0..6ee6b026e78 100644
--- a/src/Flash/index.ts
+++ b/src/Flash/index.ts
@@ -1 +1,2 @@
-export {default, FlashProps} from './Flash'
+export {default} from './Flash'
+export type {FlashProps} from './Flash'
diff --git a/src/Header/index.ts b/src/Header/index.ts
index bd8d3ba9c4d..2533622f7ec 100644
--- a/src/Header/index.ts
+++ b/src/Header/index.ts
@@ -1 +1,2 @@
-export {default, HeaderProps, HeaderItemProps, HeaderLinkProps} from './Header'
+export {default} from './Header'
+export type {HeaderProps, HeaderItemProps, HeaderLinkProps} from './Header'
diff --git a/src/Heading/index.ts b/src/Heading/index.ts
index f8553b10256..cf028a9dc5a 100644
--- a/src/Heading/index.ts
+++ b/src/Heading/index.ts
@@ -1 +1,2 @@
-export {default, HeadingProps} from './Heading'
+export {default} from './Heading'
+export type {HeadingProps} from './Heading'
diff --git a/src/LabelGroup/index.ts b/src/LabelGroup/index.ts
index ce8583dc6be..0de8aeca532 100644
--- a/src/LabelGroup/index.ts
+++ b/src/LabelGroup/index.ts
@@ -1 +1,2 @@
-export {default, LabelGroupProps} from './LabelGroup'
+export {default} from './LabelGroup'
+export type {LabelGroupProps} from './LabelGroup'
diff --git a/src/Link/index.ts b/src/Link/index.ts
index 39f54021c87..32748dbe72e 100644
--- a/src/Link/index.ts
+++ b/src/Link/index.ts
@@ -1 +1,2 @@
-export {default, LinkProps} from './Link'
+export {default} from './Link'
+export type {LinkProps} from './Link'
diff --git a/src/Octicon/index.ts b/src/Octicon/index.ts
index 287bafbcdc7..f899d038b6f 100644
--- a/src/Octicon/index.ts
+++ b/src/Octicon/index.ts
@@ -1 +1,2 @@
-export {default, OcticonProps} from './Octicon'
+export {default} from './Octicon'
+export type {OcticonProps} from './Octicon'
diff --git a/src/Overlay/index.ts b/src/Overlay/index.ts
index 646e337036d..52a0ccc5e68 100644
--- a/src/Overlay/index.ts
+++ b/src/Overlay/index.ts
@@ -1 +1,2 @@
-export {default, OverlayProps} from './Overlay'
+export {default} from './Overlay'
+export type {OverlayProps} from './Overlay'
diff --git a/src/Pagehead/index.ts b/src/Pagehead/index.ts
index 4f297d4d26d..56fcaed4dfd 100644
--- a/src/Pagehead/index.ts
+++ b/src/Pagehead/index.ts
@@ -1 +1,2 @@
-export {default, PageheadProps} from './Pagehead'
+export {default} from './Pagehead'
+export type {PageheadProps} from './Pagehead'
diff --git a/src/PointerBox/index.ts b/src/PointerBox/index.ts
index 2fe24d0940f..09bc993acc4 100644
--- a/src/PointerBox/index.ts
+++ b/src/PointerBox/index.ts
@@ -1 +1,2 @@
-export {default, PointerBoxProps} from './PointerBox'
+export {default} from './PointerBox'
+export type {PointerBoxProps} from './PointerBox'
diff --git a/src/Popover/index.ts b/src/Popover/index.ts
index 43a648fdd86..6ada75608a8 100644
--- a/src/Popover/index.ts
+++ b/src/Popover/index.ts
@@ -1 +1,2 @@
-export {default, PopoverProps, PopoverContentProps} from './Popover'
+export {default} from './Popover'
+export type {PopoverProps, PopoverContentProps} from './Popover'
diff --git a/src/Radio/index.ts b/src/Radio/index.ts
index 66e5e106320..3377e449299 100644
--- a/src/Radio/index.ts
+++ b/src/Radio/index.ts
@@ -1 +1,2 @@
-export {default, RadioProps} from './Radio'
+export {default} from './Radio'
+export type {RadioProps} from './Radio'
diff --git a/src/Spinner/index.ts b/src/Spinner/index.ts
index c39a87bf72a..f3aff76bc63 100644
--- a/src/Spinner/index.ts
+++ b/src/Spinner/index.ts
@@ -1 +1,2 @@
-export {default, SpinnerProps} from './Spinner'
+export {default} from './Spinner'
+export type {SpinnerProps} from './Spinner'
diff --git a/src/StateLabel/index.ts b/src/StateLabel/index.ts
index 5b4064d2e61..f5ffeedf304 100644
--- a/src/StateLabel/index.ts
+++ b/src/StateLabel/index.ts
@@ -1 +1,2 @@
-export {default, StateLabelProps} from './StateLabel'
+export {default} from './StateLabel'
+export type {StateLabelProps} from './StateLabel'
diff --git a/src/StyledOcticon/index.ts b/src/StyledOcticon/index.ts
index 3cd35a50124..3f9d39ff306 100644
--- a/src/StyledOcticon/index.ts
+++ b/src/StyledOcticon/index.ts
@@ -1 +1,2 @@
-export {default, StyledOcticonProps} from './StyledOcticon'
+export {default} from './StyledOcticon'
+export type {StyledOcticonProps} from './StyledOcticon'
diff --git a/src/SubNav/index.ts b/src/SubNav/index.ts
index 9f06f42997d..c9fc0acfab7 100644
--- a/src/SubNav/index.ts
+++ b/src/SubNav/index.ts
@@ -1 +1,2 @@
-export {default, SubNavProps, SubNavLinkProps, SubNavLinksProps} from './SubNav'
+export {default} from './SubNav'
+export type {SubNavProps, SubNavLinkProps, SubNavLinksProps} from './SubNav'
diff --git a/src/TabNav/index.ts b/src/TabNav/index.ts
index 7291a39d8ae..c46d247f1a3 100644
--- a/src/TabNav/index.ts
+++ b/src/TabNav/index.ts
@@ -1 +1,2 @@
-export {default, TabNavProps, TabNavLinkProps} from './TabNav'
+export {default} from './TabNav'
+export type {TabNavProps, TabNavLinkProps} from './TabNav'
diff --git a/src/Text/index.ts b/src/Text/index.ts
index e92da1782f9..728dfeb2bd3 100644
--- a/src/Text/index.ts
+++ b/src/Text/index.ts
@@ -1 +1,2 @@
-export {default, TextProps} from './Text'
+export {default} from './Text'
+export type {TextProps} from './Text'
diff --git a/src/TextInput/index.ts b/src/TextInput/index.ts
index 448e01213b6..9395085508e 100644
--- a/src/TextInput/index.ts
+++ b/src/TextInput/index.ts
@@ -1 +1,2 @@
-export {default, TextInputProps, TextInputNonPassthroughProps} from './TextInput'
+export {default} from './TextInput'
+export type {TextInputProps, TextInputNonPassthroughProps} from './TextInput'
diff --git a/src/TextInputWithTokens/index.ts b/src/TextInputWithTokens/index.ts
index 946e55a4578..a404658378a 100644
--- a/src/TextInputWithTokens/index.ts
+++ b/src/TextInputWithTokens/index.ts
@@ -1 +1,2 @@
-export {default, TextInputWithTokensProps} from './TextInputWithTokens'
+export {default} from './TextInputWithTokens'
+export type {TextInputWithTokensProps} from './TextInputWithTokens'
diff --git a/src/Textarea/index.ts b/src/Textarea/index.ts
index a2ed45205de..2db48f4f440 100644
--- a/src/Textarea/index.ts
+++ b/src/Textarea/index.ts
@@ -1 +1,2 @@
-export {default, TextareaProps, DEFAULT_TEXTAREA_COLS, DEFAULT_TEXTAREA_RESIZE, DEFAULT_TEXTAREA_ROWS} from './Textarea'
+export {default, DEFAULT_TEXTAREA_COLS, DEFAULT_TEXTAREA_RESIZE, DEFAULT_TEXTAREA_ROWS} from './Textarea'
+export type {TextareaProps} from './Textarea'
diff --git a/src/Timeline/index.ts b/src/Timeline/index.ts
index 941203c7dc3..cde44809333 100644
--- a/src/Timeline/index.ts
+++ b/src/Timeline/index.ts
@@ -1,5 +1,5 @@
-export {
-  default,
+export {default} from './Timeline'
+export type {
   TimelineProps,
   TimelineItemsProps,
   TimelineBadgeProps,
diff --git a/src/ToggleSwitch/index.ts b/src/ToggleSwitch/index.ts
index 428d8e6810d..469cdbeac81 100644
--- a/src/ToggleSwitch/index.ts
+++ b/src/ToggleSwitch/index.ts
@@ -1 +1,2 @@
-export {default, ToggleSwitchProps} from './ToggleSwitch'
+export {default} from './ToggleSwitch'
+export type {ToggleSwitchProps} from './ToggleSwitch'
diff --git a/src/Truncate/index.ts b/src/Truncate/index.ts
index ac7af06f7ea..3d9f742c279 100644
--- a/src/Truncate/index.ts
+++ b/src/Truncate/index.ts
@@ -1 +1,2 @@
-export {default, TruncateProps} from './Truncate'
+export {default} from './Truncate'
+export type {TruncateProps} from './Truncate'
diff --git a/src/UnderlineNav/index.ts b/src/UnderlineNav/index.ts
index 9f0c53e2991..acd3c48ca0f 100644
--- a/src/UnderlineNav/index.ts
+++ b/src/UnderlineNav/index.ts
@@ -1 +1,2 @@
-export {default, UnderlineNavProps, UnderlineNavLinkProps} from './UnderlineNav'
+export {default} from './UnderlineNav'
+export type {UnderlineNavProps, UnderlineNavLinkProps} from './UnderlineNav'