diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreenUserStatusRow.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreenUserStatusRow.swift
index 79f86ebf9..4b62e4907 100644
--- a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreenUserStatusRow.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreenUserStatusRow.swift
@@ -56,6 +56,11 @@ struct SettingsScreenUserStatusRow: View {
                         .textFieldStyle(.compound(.raised))
                         .focused($isCustomFieldFocused)
                         .onAppear(perform: focusCustomField)
+                        .onChange(of: customText) { _, newValue in
+                            if newValue.count > 30 {
+                                customText = String(newValue.prefix(30))
+                            }
+                        }
                         .accessibilityLabel(L10n.screenSettingsUserStatusCustomHint)
                         .padding(.vertical, 3)