diff --git a/src/expandableCalendar/index.tsx b/src/expandableCalendar/index.tsx
index f42ef6804..c1c93f935 100644
--- a/src/expandableCalendar/index.tsx
+++ b/src/expandableCalendar/index.tsx
@@ -143,9 +143,22 @@ const ExpandableCalendar = forwardRef<ExpandableCalendarRef, ExpandableCalendarP
 
   const [screenReaderEnabled, setScreenReaderEnabled] = useState(false);
   const [headerHeight, setHeaderHeight] = useState(0);
-  const onHeaderLayout = useCallback(({nativeEvent: {layout: {height}}}: LayoutChangeEvent) => {
-      setHeaderHeight(height || DEFAULT_HEADER_HEIGHT);
-  }, []);
+
+  const shouldMeasureHeader = useRef(true);
+  const onHeaderLayout = useCallback(
+    ({
+      nativeEvent: {
+        layout: {height}
+      }
+    }: LayoutChangeEvent) => {
+      const _height = (height || DEFAULT_HEADER_HEIGHT) + 5;
+      if (height !== headerHeight) {
+        setHeaderHeight(_height);
+      }
+      shouldMeasureHeader.current = false;
+    },
+    [headerHeight]
+  );
 
   /** Date */
 
@@ -637,7 +650,13 @@ const ExpandableCalendar = forwardRef<ExpandableCalendarRef, ExpandableCalendarP
           renderArrow={_renderArrow}
         />
       ) : (
-        <Animated.View testID={`${testID}.expandableContainer`} ref={wrapper} style={wrapperStyle} {...panResponder.panHandlers}>
+        <Animated.View
+          testID={`${testID}.expandableContainer`}
+          ref={wrapper}
+          style={wrapperStyle}
+          onLayout={shouldMeasureHeader.current ? onHeaderLayout : undefined}
+          {...panResponder.panHandlers}
+        >
           {renderCalendarList()}
           {renderWeekCalendar()}
           {!hideKnob && renderKnob()}