diff --git a/src/Container.tsx b/src/Container.tsx
index 8d26309c..65cc1240 100644
--- a/src/Container.tsx
+++ b/src/Container.tsx
@@ -89,7 +89,7 @@ const Container = React.forwardRef<CollapsibleRef, CollapsibleProps>(
       initialTabBarHeight
     )
     const [headerHeight, setHeaderHeight] = React.useState<number | undefined>(
-      initialHeaderHeight
+      !HeaderComponent ? 0 : initialHeaderHeight
     )
 
     const contentInset = React.useMemo(