diff --git a/apps/rebreak-native/app/dm.tsx b/apps/rebreak-native/app/dm.tsx
index 001eb1c..b4c20de 100644
--- a/apps/rebreak-native/app/dm.tsx
+++ b/apps/rebreak-native/app/dm.tsx
@@ -4,12 +4,12 @@ import {
   Text,
   FlatList,
   TouchableOpacity,
-  KeyboardAvoidingView,
   Platform,
   ActivityIndicator,
   Image,
   StyleSheet,
 } from 'react-native';
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
@@ -275,7 +275,7 @@ export default function DmScreen() {
 
       <KeyboardAvoidingView
         style={{ flex: 1 }}
-        behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+        behavior="padding"
         keyboardVerticalOffset={0}
       >
         <View style={{ flex: 1, backgroundColor: chatBg }}>
diff --git a/apps/rebreak-native/app/room.tsx b/apps/rebreak-native/app/room.tsx
index 7d0a8dc..6eaba2e 100644
--- a/apps/rebreak-native/app/room.tsx
+++ b/apps/rebreak-native/app/room.tsx
@@ -9,12 +9,12 @@ import {
   Modal,
   TextInput,
   ActivityIndicator,
-  KeyboardAvoidingView,
   Platform,
   Alert,
   StyleSheet,
   ScrollView,
 } from 'react-native';
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
@@ -360,7 +360,7 @@ export default function RoomScreen() {
       ) : (
         <KeyboardAvoidingView
           style={{ flex: 1 }}
-          behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+          behavior="padding"
         >
           <FlatList
             ref={flatRef}
diff --git a/apps/rebreak-native/components/KeyboardAwareScreen.tsx b/apps/rebreak-native/components/KeyboardAwareScreen.tsx
index 410dcf0..b442c6b 100644
--- a/apps/rebreak-native/components/KeyboardAwareScreen.tsx
+++ b/apps/rebreak-native/components/KeyboardAwareScreen.tsx
@@ -1,7 +1,6 @@
 import { ReactNode } from 'react';
 import {
   Keyboard,
-  KeyboardAvoidingView,
   Platform,
   ScrollView,
   StyleProp,
@@ -9,6 +8,7 @@ import {
   View,
   ViewStyle,
 } from 'react-native';
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
 
 export interface KeyboardAwareScreenProps {
   children: ReactNode;
@@ -42,7 +42,7 @@ export function KeyboardAwareScreen({
   return (
     <KeyboardAvoidingView
       style={[{ flex: 1 }, style]}
-      behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+      behavior="padding"
       keyboardVerticalOffset={headerOffset}
     >
       {scrollable ? (