diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f5211ee968..6d9cf20981f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
 - Added `MessageComposerViewModelBinder` for Java parity with Kotlin's `MessageComposerViewModel.bindView` extension function. [#4931](https://github.com/GetStream/stream-chat-android/pull/4931)
 
 ### ⚠️ Changed
+- Changed `MessageListView.setCustomItemAnimator` signature to allow passing `null` to reset the item animator. [#4933](https://github.com/GetStream/stream-chat-android/pull/4933)
 
 ### ❌ Removed
 
diff --git a/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/list/MessageListView.kt b/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/list/MessageListView.kt
index b81a68be434..544fd4d8bcd 100644
--- a/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/list/MessageListView.kt
+++ b/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/list/MessageListView.kt
@@ -836,7 +836,7 @@ public class MessageListView : ConstraintLayout {
      * @param itemAnimator The ItemAnimator being set. If null, no animations will occur when changes occur
      * to the items in this MessageListView.
      */
-    public fun setCustomItemAnimator(itemAnimator: ItemAnimator) {
+    public fun setCustomItemAnimator(itemAnimator: ItemAnimator?) {
         binding.chatMessagesRV.itemAnimator = itemAnimator
     }