diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 12ba7708b..6c1c2279d 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -1589,7 +1589,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 if (!mentionsAtTop) {
                     holder.binding.content.setSelection(statusDraft.cursorPosition);
                 } else {
-                    if (capitalize && !statusDraft.text.endsWith("\n")) {
+                    if (capitalize && statusDraft.text != null && !statusDraft.text.endsWith("\n")) {
                         statusDraft.text += "\n";
                         holder.binding.content.setText(statusDraft.text);
                     }