diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index fd5d7d32..9d3b372e 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,6 +1,13 @@
-## 2.0.0-nullsafety.1
+## 2.0.0-nullsafety.3
+
+- Fix MessageInput overflow when there are no actions
+
+## 2.0.0-nullsafety.2
 
 - Migrate this package to null safety
+
+## 1.5.4
+
 - Updated `stream_chat_core` dependency
 
 ## 1.5.3
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index 3091043c..13f553d7 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -476,6 +476,7 @@ class MessageInputState extends State<MessageInput> {
           firstChild: IconButton(
             onPressed: () => setState(() => _actionsShrunk = false),
             icon: Transform.rotate(
+              alignment: Alignment.center,
               angle: (widget.actionsLocation == ActionsLocation.right ||
                       widget.actionsLocation == ActionsLocation.rightInside)
                   ? pi
@@ -493,8 +494,13 @@ class MessageInputState extends State<MessageInput> {
             ),
             splashRadius: 24,
           ),
-          secondChild: FittedBox(
+          secondChild: widget.disableAttachments &&
+              !widget.showCommandsButton &&
+              widget.actions?.isNotEmpty != true
+              ? const Offstage()
+              : FittedBox(
             child: Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: <Widget>[
                 if (!widget.disableAttachments) _buildAttachmentButton(),
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index 8ac73bbf..1b2dbe2f 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 2.0.0-nullsafety.1
+version: 2.0.0-nullsafety.3
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -36,7 +36,7 @@ dependencies:
   scrollable_positioned_list: ^0.2.0-nullsafety.0
   share_plus: ^2.0.3
   shimmer: ^2.0.0
-  stream_chat_flutter_core: ^2.0.0-nullsafety.0
+  stream_chat_flutter_core: ^2.0.0-nullsafety.2
   substring_highlight: ^1.0.26
   synchronized: ^3.0.0
   url_launcher: ^6.0.3
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index e3436ad3..f07b49bd 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,8 +1,16 @@
+## 2.0.0-nullsafety.2
+
+* Fix ChannelsBloc not performing calls if pagination ended
+
 ## 2.0.0-nullsafety.1
 
 * Migrate this package to null safety
 * Update llc dependency
 
+## 1.5.3
+
+* Fix ChannelsBloc not performing calls if pagination ended
+
 ## 1.5.2
 
 * Update llc dependency
diff --git a/packages/stream_chat_flutter_core/README.md b/packages/stream_chat_flutter_core/README.md
index 9d39ab76..8e74c881 100644
--- a/packages/stream_chat_flutter_core/README.md
+++ b/packages/stream_chat_flutter_core/README.md
@@ -1,4 +1,4 @@
-# Official Core Flutter SDK for [Stream Chat](https://getstream.io/chat/)
+# Official Core [Flutter SDK](https://getstream.io/chat/sdk/flutter/) for [Stream Chat API](https://getstream.io/chat/)
 
 > The official Flutter core components for Stream Chat, a service for
 > building chat applications.
diff --git a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart
index 32e63bdc..ce17235a 100644
--- a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart
@@ -95,7 +95,10 @@ class ChannelsBlocState extends State<ChannelsBloc>
   }) async {
     final client = StreamChatCore.of(context).client;
 
-    if (_paginationEnded || _queryChannelsLoadingController.value == true) {
+    final clear = paginationParams.offset == 0;
+
+    if ((!clear && _paginationEnded) ||
+        _queryChannelsLoadingController.value == true) {
       return;
     }
 
@@ -104,7 +107,6 @@ class ChannelsBlocState extends State<ChannelsBloc>
     }
 
     try {
-      final clear = paginationParams.offset == 0;
       final oldChannels = List<Channel>.from(channels ?? []);
       var newChannels = <Channel>[];
       await for (final channels in client.queryChannels(
@@ -146,7 +148,11 @@ class ChannelsBlocState extends State<ChannelsBloc>
     final client = StreamChatCore.of(context).client;
 
     if (!widget.lockChannelsOrder) {
-      _subscriptions.add(client.on(EventType.messageNew).listen((e) {
+      _subscriptions.add(client
+          .on(
+        EventType.messageNew,
+      )
+          .listen((e) {
         final newChannels = List<Channel>.from(channels ?? []);
         final index = newChannels.indexWhere((c) => c.cid == e.cid);
         if (index != -1) {
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 059d927e..c84242b8 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter_core
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK Core. Build your own chat experience using Dart and Flutter.
-version: 2.0.0-nullsafety.1
+version: 2.0.0-nullsafety.2
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues