diff --git a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt
index f32a004155..13b9ecd335 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt
@@ -272,7 +272,7 @@ private fun NicknameContent(
             value = state.lastName,
             hint = stringResource(id = R.string.NicknameActivity__last_name),
             clearContentDescription = stringResource(id = R.string.NicknameActivity__clear_last_name),
-            enabled = state.firstName.isNotBlank() || state.isEditing,
+            enabled = true,
             singleLine = true,
             onValueChange = callback::onLastNameChanged,
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),