diff --git a/android/src/main/java/com/swmansion/rnscreens/InsetsObserverProxy.kt b/android/src/main/java/com/swmansion/rnscreens/InsetsObserverProxy.kt
index dd5468284..8da1f52ed 100644
--- a/android/src/main/java/com/swmansion/rnscreens/InsetsObserverProxy.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/InsetsObserverProxy.kt
@@ -23,10 +23,7 @@ object InsetsObserverProxy : OnApplyWindowInsetsListener {
     ): WindowInsetsCompat {
         var rollingInsets =
             if (shouldForwardInsetsToView) {
-                WindowInsetsCompat.toWindowInsetsCompat(
-                    v.onApplyWindowInsets(insets.toWindowInsets()),
-                    v,
-                )
+                ViewCompat.onApplyWindowInsets(v, insets)
             } else {
                 insets
             }
@@ -57,8 +54,10 @@ object InsetsObserverProxy : OnApplyWindowInsetsListener {
         }
     }
 
-    fun unregisterOnView(view: View) {
-        ViewCompat.setOnApplyWindowInsetsListener(view, null)
+    fun unregister() {
+        getObservedView()?.takeIf { hasBeenRegistered }?.let {
+            ViewCompat.setOnApplyWindowInsetsListener(it, null)
+        }
     }
 
     private fun getObservedView(): View? = eventSourceView.get()
diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt
index c56ede148..37aefe87b 100644
--- a/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt
@@ -163,7 +163,6 @@ object ScreenWindowTraits {
                         InsetsObserverProxy.registerOnView(decorView)
                         InsetsObserverProxy.addOnApplyWindowInsetsListener(windowInsetsListener)
                     } else {
-                        InsetsObserverProxy.unregisterOnView(decorView)
                         InsetsObserverProxy.removeOnApplyWindowInsetsListener(windowInsetsListener)
                     }
                     ViewCompat.requestApplyInsets(decorView)
diff --git a/apps/Example.tsx b/apps/Example.tsx
index 49381ab30..ba27c3579 100644
--- a/apps/Example.tsx
+++ b/apps/Example.tsx
@@ -39,10 +39,6 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 enableFreeze();
 
-if (Platform.OS === 'android') {
-  StatusBar.setTranslucent(true);
-}
-
 const SCREENS: Record<
   string,
   {
diff --git a/apps/src/tests/TestAndroidTransitions.tsx b/apps/src/tests/TestAndroidTransitions.tsx
new file mode 100644
index 000000000..0d98e720e
--- /dev/null
+++ b/apps/src/tests/TestAndroidTransitions.tsx
@@ -0,0 +1,102 @@
+import { NavigationContainer, RouteProp } from "@react-navigation/native";
+import { NativeStackNavigationProp, createNativeStackNavigator } from "@react-navigation/native-stack";
+// import { NativeStackNavigationProp, createNativeStackNavigator } from "react-native-screens/native-stack";
+import React from "react";
+import { Button, TextInput, View } from "react-native";
+
+type RouteParamList = {
+  Home: undefined;
+  Second: undefined;
+  FormSheet: undefined;
+  Modal: undefined;
+  NestedStackHost: undefined;
+}
+
+type RouteProps<RouteName extends keyof RouteParamList> = {
+  navigation: NativeStackNavigationProp<RouteParamList, RouteName>,
+  route: RouteProp<RouteParamList, RouteName>,
+}
+
+const Stack = createNativeStackNavigator<RouteParamList>();
+// const Stack = createNativeStackNavigator();
+
+function Home({ navigation }: RouteProps<'Home'>): React.JSX.Element {
+  return (
+    <View style={{ flex: 1, backgroundColor: 'lightsalmon', gap: 12 }}>
+      <View style={{ marginTop: 12 }}>
+        <Button title="Go Second" onPress={() => navigation.navigate('Second')} />
+      </View>
+      <View>
+        <Button title="Go FormSheet" onPress={() => navigation.navigate('FormSheet')} />
+      </View>
+      <View>
+        <Button title="Go Modal" onPress={() => navigation.navigate('Modal')} />
+      </View>
+    </View>
+  );
+}
+
+function Second({ navigation }: RouteProps<'Second'>): React.JSX.Element {
+  return (
+    <View style={{ flex: 1, backgroundColor: 'lightgreen', gap: 12 }}>
+      <View style={{ marginTop: 12 }}>
+        <Button title="Go Home" onPress={() => navigation.popTo('Home')} />
+      </View>
+      <View style={{}}>
+        <Button title="Go FormSheet" onPress={() => navigation.navigate('FormSheet')} />
+      </View>
+    </View>
+  );
+}
+
+function FormSheet({ navigation }: RouteProps<'FormSheet'> | RouteProps<'Modal'>): React.JSX.Element {
+  return (
+    <View style={{ backgroundColor: 'lightgreen' }}>
+      <View style={{ marginVertical: 12 }}>
+        <Button title="Go back" onPress={() => navigation.goBack()} />
+      </View>
+      <View style={{ alignItems: 'center' }}>
+        <TextInput style={{ marginVertical: 12, paddingVertical: 8, backgroundColor: 'lavender', borderRadius: 24, width: '80%' }} placeholder="Trigger keyboard..."></TextInput>
+      </View>
+    </View>
+  );
+}
+
+function Modal({ navigation }: RouteProps<'Modal'>): React.JSX.Element {
+  return (
+    <View style={{ flex: 1, backgroundColor: 'lightgreen' }}>
+      <View style={{ marginVertical: 12 }}>
+        <Button title="Go back" onPress={() => navigation.goBack()} />
+      </View>
+      <View style={{ alignItems: 'center' }}>
+        <TextInput style={{ marginVertical: 12, paddingVertical: 8, backgroundColor: 'lavender', borderRadius: 24, width: '80%' }} placeholder="Trigger keyboard..."></TextInput>
+      </View>
+    </View>
+  );
+}
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator screenOptions={{
+        statusBarTranslucent: false
+      }}>
+        <Stack.Screen name="Home" component={Home} />
+        <Stack.Screen name="Second" component={Second} options={{
+          headerShown: false,
+        }} />
+        <Stack.Screen name="FormSheet" component={FormSheet} options={{
+          presentation: 'formSheet',
+          sheetAllowedDetents: [0.5, 0.7],
+          contentStyle: {
+            backgroundColor: 'lightgreen'
+          },
+        }} />
+        <Stack.Screen name="Modal" component={Modal} options={{
+          presentation: 'modal',
+          headerShown: false,
+        }} />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 1555a99ba..db982b7ef 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -125,3 +125,4 @@ export { default as TestHeaderTitle } from './TestHeaderTitle';
 export { default as TestModalNavigation } from './TestModalNavigation';
 export { default as TestMemoryLeak } from './TestMemoryLeak';
 export { default as TestFormSheet } from './TestFormSheet';
+export { default as TestAndroidTransitions } from './TestAndroidTransitions';