diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
index 9fa58efd8..484e48bc0 100644
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@@ -37,6 +37,7 @@ abstract class SettingKeys {
 }
 
 enum AppSettings<T> {
+  textMessageMaxLength<int>('textMessageMaxLength', 16384),
   audioRecordingNumChannels<int>('audioRecordingNumChannels', 1),
   audioRecordingAutoGain<bool>('audioRecordingAutoGain', true),
   audioRecordingEchoCancel<bool>('audioRecordingEchoCancel', false),
diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index 91ed43642..9dbacf91c 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -1,3 +1,4 @@
+import 'package:fluffychat/config/setting_keys.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -437,7 +438,8 @@ class InputBar extends StatelessWidget {
           // it sets the types for the callback incorrectly
           onSubmitted!(text);
         },
-        maxLength: 16384,
+        maxLength:
+            AppSettings.textMessageMaxLength.getItem(Matrix.of(context).store),
         decoration: decoration,
         onChanged: (text) {
           // fix for the library for now