diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ReplyLayout.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ReplyLayout.java
index cc6a557f6..058350559 100644
--- a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ReplyLayout.java
+++ b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/layout/ReplyLayout.java
@@ -614,6 +614,9 @@ public void loadDraftIntoViews(Reply draft) {
         if (!draft.flag.equals("")) {
             setFlagPickerText(draft.flag);
             pickedFlag = new Flag(draft.flag, draft.flag, null);
+        } else {
+            flagPicker.setText(R.string.reply_flag);
+            pickedFlag = null;
         }
         options.setText(draft.options);
         fileName.setText(draft.fileName);