diff --git a/package/src/components/MessageList/MessageList.tsx b/package/src/components/MessageList/MessageList.tsx
index 365beede08..9c04cd5a5e 100644
--- a/package/src/components/MessageList/MessageList.tsx
+++ b/package/src/components/MessageList/MessageList.tsx
@@ -956,10 +956,19 @@ const MessageListWithContext = <
       });
   }
 
-  const renderListEmptyComponent = () => (
-    <View style={[styles.flex, styles.invert]} testID='empty-state'>
-      <EmptyStateIndicator listType='message' />
-    </View>
+  const shouldApplyAndroidWorkaround =
+    inverted && Platform.OS === 'android' && Platform.Version >= 33;
+
+  const renderListEmptyComponent = useCallback(
+    () => (
+      <View
+        style={[styles.flex, shouldApplyAndroidWorkaround ? styles.invertAndroid : styles.invert]}
+        testID='empty-state'
+      >
+        <EmptyStateIndicator listType='message' />
+      </View>
+    ),
+    [EmptyStateIndicator, shouldApplyAndroidWorkaround],
   );
 
   if (!FlatList) return null;
@@ -979,9 +988,6 @@ const MessageListWithContext = <
     return null;
   };
 
-  const shouldApplyAndroidWorkaround =
-    inverted && Platform.OS === 'android' && Platform.Version >= 33;
-
   return (
     <View
       style={[styles.container, { backgroundColor: white_snow }, container]}