diff --git a/Package.swift b/Package.swift
index 45e6b6fa6..3ed26469f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.67.0"),
+        .package(url: "https://github.com/GetStream/stream-chat-swift.git", branch: "develop"),
     ],
     targets: [
         .target(
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift
index aebc4132e..f919f0b18 100644
--- a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift
+++ b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift
@@ -248,7 +248,7 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                     }
                 }
                 .flippedUpsideDown()
-                .frame(maxWidth: .infinity)
+                .frame(maxWidth: .infinity, maxHeight: messages.isEmpty ? .infinity : nil)
                 .clipped()
                 .onChange(of: scrolledId) { scrolledId in
                     if let scrolledId = scrolledId {