diff --git a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
index a35238fbff..c3f4ce1c21 100644
--- a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
+++ b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
@@ -16,6 +16,8 @@ abstract class FabricEnabledHeaderSubviewViewGroup(
 
     private var lastWidth = 0f
     private var lastHeight = 0f
+    private var lastOffsetX = 0f
+    private var lastOffsetY = 0f
 
     fun setStateWrapper(wrapper: StateWrapper?) {
         mStateWrapper = wrapper
@@ -45,13 +47,17 @@ abstract class FabricEnabledHeaderSubviewViewGroup(
         // Check incoming state values. If they're already the correct value, return early to prevent
         // infinite UpdateState/SetState loop.
         if (abs(lastWidth - realWidth) < DELTA &&
-            abs(lastHeight - realHeight) < DELTA
+            abs(lastHeight - realHeight) < DELTA &&
+            abs(lastOffsetX - offsetXDip) < DELTA &&
+            abs(lastOffsetY - offsetYDip) < DELTA
         ) {
             return
         }
 
         lastWidth = realWidth
         lastHeight = realHeight
+        lastOffsetX = offsetXDip
+        lastOffsetY = offsetYDip
 
         val map: WritableMap =
             WritableNativeMap().apply {
diff --git a/apps/src/tests/Test2675.tsx b/apps/src/tests/Test2675.tsx
new file mode 100644
index 0000000000..9bb12ac4a1
--- /dev/null
+++ b/apps/src/tests/Test2675.tsx
@@ -0,0 +1,121 @@
+import { NavigationContainer } from '@react-navigation/native';
+import { NativeStackNavigationProp, createNativeStackNavigator } from '@react-navigation/native-stack';
+import React from 'react';
+import { Button, StyleSheet, Text, View } from 'react-native';
+
+type RouteParams = {
+  Home: undefined;
+  DynamicHeader: undefined;
+}
+
+type NavigationProps = {
+  navigation: NativeStackNavigationProp<RouteParams>;
+}
+
+const Stack = createNativeStackNavigator();
+
+function HomeScreen({ navigation }: NavigationProps) {
+  return (
+    <View style={styles.container}>
+      <Text>Home Screen</Text>
+      <Button title="Navigate DynamicHeaderScreen" onPress={() => navigation.navigate('DynamicHeader')} />
+    </View>
+  );
+}
+
+function DynamicHeaderScreen({ navigation }: NavigationProps) {
+  React.useLayoutEffect(() => {
+    navigation.setOptions({
+      headerRight: HeaderRight,
+    });
+  }, [navigation]);
+
+  React.useEffect(() => {
+    const timerId = setTimeout(() => {
+      navigation.setOptions({
+        headerLeft: HeaderLeft,
+        headerRight: HeaderLeft,
+      });
+    }, 1300);
+
+    return () => {
+      clearTimeout(timerId);
+    };
+  }, [navigation]);
+
+  return (
+    <View style={styles.container}>
+      <Text>DynamicHeaderScreen</Text>
+      <Button title="Go back" onPress={() => navigation.popTo('Home')} />
+    </View>
+  );
+}
+
+function HeaderLeft() {
+  return (
+    <View>
+      <Text>Left</Text>
+    </View>
+  );
+}
+
+function HeaderTitle() {
+  return (
+    <View>
+      <Text>Title</Text>
+    </View>
+  );
+}
+
+function HeaderRight() {
+  return (
+    <View>
+      <Text>Right</Text>
+    </View>
+  );
+}
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator>
+        <Stack.Screen
+          name="Home"
+          component={HomeScreen}
+          options={{
+            statusBarTranslucent: true,
+            statusBarStyle: 'dark',
+            //headerTitle: HeaderTitle,
+            //headerRight: HeaderRight,
+            headerSearchBarOptions: {
+              placeholder: 'Search...',
+              onChangeText: (event) => {
+                console.log('Search text:', event.nativeEvent.text);
+              },
+            },
+          }}
+        />
+        <Stack.Screen name="DynamicHeader" component={DynamicHeaderScreen} options={{
+          statusBarTranslucent: true,
+          statusBarStyle: 'dark',
+          headerTitle: HeaderTitle,
+          headerSearchBarOptions: {
+            placeholder: 'Search...',
+            onChangeText: (event) => {
+              console.log('Search text:', event.nativeEvent.text);
+            },
+          },
+        }} />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
+
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 33f982c0d7..c283d66e8f 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -121,6 +121,7 @@ export { default as Test2466 } from './Test2466';
 export { default as Test2552 } from './Test2552';
 export { default as Test2631 } from './Test2631';
 export { default as Test2668 } from './Test2668';
+export { default as Test2675 } from './Test2675';
 export { default as TestScreenAnimation } from './TestScreenAnimation';
 export { default as TestScreenAnimationV5 } from './TestScreenAnimationV5';
 export { default as TestHeader } from './TestHeader';
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h
index f30b7651bd..a5890a1dbf 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h
@@ -35,8 +35,7 @@ class RNSScreenStackHeaderConfigComponentDescriptor final
     auto stateData = state->getData();
 
     if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode.setSize(
-          {stateData.frameSize.width, stateData.frameSize.height});
+      layoutableShadowNode.setSize(stateData.frameSize);
 #ifdef ANDROID
       layoutableShadowNode.setPadding({
           stateData.paddingStart,
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h
index 3cd113cb5c..a7e21e6193 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h
@@ -8,6 +8,7 @@
 #include <react/renderer/components/rnscreens/utils/RectUtil.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "RNSScreenStackHeaderSubviewShadowNode.h"
+#include "utils/RectUtil.h"
 
 namespace facebook::react {
 
@@ -32,12 +33,11 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final
 
     auto state = std::static_pointer_cast<
         const RNSScreenStackHeaderSubviewShadowNode::ConcreteState>(
-        shadowNode.getState());
+        shadowNode.getMostRecentState());
     auto stateData = state->getData();
 
-    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode.setSize(
-          Size{stateData.frameSize.width, stateData.frameSize.height});
+    if (!isSizeEmpty(stateData.frameSize)) {
+      layoutableShadowNode.setSize(stateData.frameSize);
     }
 
     ConcreteComponentDescriptor::adopt(shadowNode);
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h
index 8822bcbc7e..a225d481a3 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h
@@ -44,7 +44,7 @@ class JSI_EXPORT RNSScreenStackHeaderSubviewState final {
 
 #endif // ANDROID
 
-  const Size frameSize{};
+  const Size frameSize{-1.f, -1.f};
   Point contentOffset{};
 
 #pragma mark - Getters
diff --git a/common/cpp/react/renderer/components/rnscreens/utils/RectUtil.h b/common/cpp/react/renderer/components/rnscreens/utils/RectUtil.h
index b7407172b5..8d7e2496b6 100644
--- a/common/cpp/react/renderer/components/rnscreens/utils/RectUtil.h
+++ b/common/cpp/react/renderer/components/rnscreens/utils/RectUtil.h
@@ -33,4 +33,11 @@ inline constexpr bool checkFrameSizesEqualWithEps(
       equalWithRespectToEps(first.height, second.height, eps);
 }
 
+/**
+ * @return false if any component value is less than 0
+ */
+inline constexpr bool isSizeEmpty(const react::Size &size) {
+  return size.width < 0 || size.height < 0;
+}
+
 } // namespace rnscreens