diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbdf323d357..feb7b641d79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix incorrect key in `created_by` filter used in channel list query [#1544](https://github.com/GetStream/stream-chat-swift/issues/1544)
 - Fix message list jumps when new reaction added [#1542](https://github.com/GetStream/stream-chat-swift/pull/1542)
 - Fix message list jumps when message received [#1542](https://github.com/GetStream/stream-chat-swift/pull/1542)
+- Fix broken constraint in the `ComposerView`, we have made the `BottomContainer` a standard `UIStackView` [#1545](https://github.com/GetStream/stream-chat-swift/pull/1545)
 
 ### 🔄 Changed
 - `LogConfig` changes after logger was used will now take affect [#1522](https://github.com/GetStream/stream-chat-swift/issues/1522)
 
-
 # [4.1.0](https://github.com/GetStream/stream-chat-swift/releases/tag/4.1.0)
 _October 12, 2021_
 
diff --git a/Sources/StreamChatUI/Composer/ComposerView.swift b/Sources/StreamChatUI/Composer/ComposerView.swift
index b8c4c04aadd..a23c74ef134 100644
--- a/Sources/StreamChatUI/Composer/ComposerView.swift
+++ b/Sources/StreamChatUI/Composer/ComposerView.swift
@@ -27,8 +27,7 @@ open class ComposerView: _View, ThemeProvider {
         .withoutAutoresizingMaskConstraints
 
     /// The container that displays the components below the message input view.
-    public private(set) lazy var bottomContainer = ContainerStackView()
-        .withoutAutoresizingMaskConstraints
+    public private(set) lazy var bottomContainer = UIStackView()
 
     /// The container that layouts the message input view and the leading/trailing containers around it.
     public private(set) lazy var centerContainer = ContainerStackView()