diff --git a/packages/stream_core_flutter/lib/src/components/message_composer/message_composer_input.dart b/packages/stream_core_flutter/lib/src/components/message_composer/message_composer_input.dart
index 66f60404..7fb96cb6 100644
--- a/packages/stream_core_flutter/lib/src/components/message_composer/message_composer_input.dart
+++ b/packages/stream_core_flutter/lib/src/components/message_composer/message_composer_input.dart
@@ -38,6 +38,7 @@ class StreamMessageComposerInput extends StatelessWidget {
         children: [
           ?inputHeader,
           Row(
+            crossAxisAlignment: CrossAxisAlignment.end,
             children: [
               ?inputLeading,
               Expanded(
@@ -88,7 +89,6 @@ class _MessageComposerInputField extends StatelessWidget {
         style: TextStyle(
           color: inputTheme.textColor ?? inputDefaults.textColor,
         ),
-        expands: true,
         maxLines: null,
         decoration: InputDecoration(
           border: border,