diff --git a/apps/src/tests/Test432.tsx b/apps/src/tests/Test432.tsx
index 5a0843dbc0..8274bfd299 100644
--- a/apps/src/tests/Test432.tsx
+++ b/apps/src/tests/Test432.tsx
@@ -13,18 +13,34 @@ type RootStackParamList = {
 };
 type RootStackScreenProps<T extends keyof RootStackParamList> =
   NativeStackScreenProps<RootStackParamList, T>;
+
 const HomeScreen = ({ navigation }: RootStackScreenProps<'Home'>) => {
-  const showSettings = useCallback(() => {
-    navigation.navigate('Settings');
-  }, [navigation]);
+  const [x, setX] = React.useState(false);
+  React.useEffect(() => {
+    navigation.setOptions({
+      headerBackVisible: !x,
+      headerRight: x
+        ? () => (
+            <View style={{ backgroundColor: 'green', width: 20, height: 20 }} />
+          )
+        : () => (
+            <View style={{ backgroundColor: 'green', width: 10, height: 10 }} />
+          ),
+    });
+  }, [navigation, x]);
+
   return (
     <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
-      <Button onPress={showSettings} title={'Show settings'} />
+      <Button title="Tap me for header update" onPress={() => setX(!x)} />
+      <Button
+        title={'Show settings'}
+        onPress={() => navigation.navigate('Settings')}
+      />
     </View>
   );
 };
 
-const SettingsScreen = ({ navigation }: RootStackScreenProps<'Settings'>) => {
+const SettingsScreen = () => {
   return (
     <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
       <Text>Settings</Text>
@@ -47,7 +63,7 @@ const RootNavigator = () => {
     [navigation],
   );
   return (
-    <RootStack.Navigator screenOptions={{ headerShown: false }}>
+    <RootStack.Navigator>
       <RootStack.Screen name="Home" component={HomeScreen} />
       <RootStack.Screen
         name="Settings"
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 4750e9be0f..04abae0cfb 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -681,6 +681,9 @@ + (void)updateViewController:(UIViewController *)vc
         break;
       }
     }
+    // We're forcing a re-layout when the subviews change,
+    // see: https://github.com/software-mansion/react-native-screens/pull/2316
+    [navctr.view layoutIfNeeded];
   }
 
   // This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
diff --git a/ios/RNSScreenStackHeaderSubview.mm b/ios/RNSScreenStackHeaderSubview.mm
index 7057422834..8ee947d821 100644
--- a/ios/RNSScreenStackHeaderSubview.mm
+++ b/ios/RNSScreenStackHeaderSubview.mm
@@ -78,9 +78,6 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
         self);
   } else {
     self.bounds = CGRect{CGPointZero, frame.size};
-    // We're forcing the parent view to layout this subview with correct frame size,
-    // see: https://github.com/software-mansion/react-native-screens/pull/2248
-    [self.superview layoutIfNeeded];
   }
 }