diff --git a/lib/features/chat/widgets/modern_chat_input.dart b/lib/features/chat/widgets/modern_chat_input.dart
index 4a8bfae..7f57fd1 100644
--- a/lib/features/chat/widgets/modern_chat_input.dart
+++ b/lib/features/chat/widgets/modern_chat_input.dart
@@ -587,6 +587,8 @@ class _ModernChatInputState extends ConsumerState<ModernChatInput>
                                             textInputAction: sendOnEnter
                                                 ? TextInputAction.send
                                                 : TextInputAction.newline,
+                                            autofillHints:
+                                                const <String>[],
                                             showCursor: true,
                                             scrollPadding:
                                                 const EdgeInsets.only(
diff --git a/lib/features/chat/widgets/user_message_bubble.dart b/lib/features/chat/widgets/user_message_bubble.dart
index 6f367b7..5c389c8 100644
--- a/lib/features/chat/widgets/user_message_bubble.dart
+++ b/lib/features/chat/widgets/user_message_bubble.dart
@@ -520,6 +520,8 @@ class _UserMessageBubbleState extends ConsumerState<UserMessageBubble>
                                                 controller: _editController,
                                                 maxLines: null,
                                                 padding: EdgeInsets.zero,
+                                                autofillHints:
+                                                    const <String>[],
                                                 style: AppTypography
                                                     .chatMessageStyle
                                                     .copyWith(
@@ -534,6 +536,8 @@ class _UserMessageBubbleState extends ConsumerState<UserMessageBubble>
                                             : TextField(
                                                 controller: _editController,
                                                 maxLines: null,
+                                                autofillHints:
+                                                    const <String>[],
                                                 style: AppTypography
                                                     .chatMessageStyle
                                                     .copyWith(