diff --git a/lib/src/chat_input_toolbar.dart b/lib/src/chat_input_toolbar.dart
index d165f0e..98811d5 100644
--- a/lib/src/chat_input_toolbar.dart
+++ b/lib/src/chat_input_toolbar.dart
@@ -93,12 +93,12 @@ class ChatInputToolbar extends StatelessWidget {
                   padding: const EdgeInsets.symmetric(horizontal: 8.0),
                   child: Directionality(
                     textDirection: textDirection,
-                    child: TextField(
+                    child: TextFormField(
                       focusNode: focusNode,
                       onChanged: (value) {
                         onTextChange!(value);
                       },
-                      onSubmitted: (value) {
+                      onSaved: (value) {
                         if (sendOnEnter) {
                           _sendMessage(context, message);
                         }