diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4ed8cdcb73..1da58aeaf1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          token: ${{ secrets.VERSION_BUMP_TOKEN }}
+          token: ${{ secrets.STREAM_CI_GITHUB_BOT_TOKEN }}
           # pulls all commits (needed for semantic release to correctly version)
           fetch-depth: '0'
       # pulls all tags (needed for semantic release to correctly version)
diff --git a/.github/workflows/sample-distribution.yml b/.github/workflows/sample-distribution.yml
index 9735d67db2..326ddbb3ac 100644
--- a/.github/workflows/sample-distribution.yml
+++ b/.github/workflows/sample-distribution.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          token: ${{ secrets.VERSION_BUMP_TOKEN }}
+          token: ${{ secrets.STREAM_CI_GITHUB_BOT_TOKEN }}
       - name: Install Ruby and Gems
         uses: ruby/setup-ruby@v1
         with:
diff --git a/examples/ExpoMessaging/yarn.lock b/examples/ExpoMessaging/yarn.lock
index ebeeb7e132..8bef9fd130 100644
--- a/examples/ExpoMessaging/yarn.lock
+++ b/examples/ExpoMessaging/yarn.lock
@@ -6672,10 +6672,10 @@ stream-buffers@2.2.x:
   version "0.0.0"
   uid ""
 
-stream-chat-react-native-core@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
-  integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
+stream-chat-react-native-core@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
+  integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/examples/SampleApp/yarn.lock b/examples/SampleApp/yarn.lock
index ea549d2196..3aa40df5bf 100644
--- a/examples/SampleApp/yarn.lock
+++ b/examples/SampleApp/yarn.lock
@@ -7605,10 +7605,10 @@ stream-buffers@2.2.x:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-stream-chat-react-native-core@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
-  integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
+stream-chat-react-native-core@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
+  integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/examples/TypeScriptMessaging/yarn.lock b/examples/TypeScriptMessaging/yarn.lock
index 31149301d1..b89d5d6336 100644
--- a/examples/TypeScriptMessaging/yarn.lock
+++ b/examples/TypeScriptMessaging/yarn.lock
@@ -7168,10 +7168,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stream-chat-react-native-core@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
-  integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
+stream-chat-react-native-core@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
+  integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/package/expo-package/yarn.lock b/package/expo-package/yarn.lock
index df29fed87b..18d45906ae 100644
--- a/package/expo-package/yarn.lock
+++ b/package/expo-package/yarn.lock
@@ -3005,10 +3005,10 @@ stream-buffers@2.2.x:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-stream-chat-react-native-core@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
-  integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
+stream-chat-react-native-core@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
+  integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/package/native-package/yarn.lock b/package/native-package/yarn.lock
index eee0f41722..0c0d0a5793 100644
--- a/package/native-package/yarn.lock
+++ b/package/native-package/yarn.lock
@@ -4410,10 +4410,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stream-chat-react-native-core@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
-  integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
+stream-chat-react-native-core@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
+  integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
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]}