diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
index af85c7dcda..18bb504f6c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
@@ -81,6 +81,7 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
       case PIN_DOES_NOT_MATCH:
         getLabel().setText(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.red),
                            getString(R.string.ConfirmKbsPinFragment__pins_dont_match)));
+        getInput().getText().clear();
         break;
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java
index 855e008531..7ab230585f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java
@@ -43,10 +43,10 @@ final class ConfirmKbsPinViewModel extends ViewModel implements BaseKbsPinViewMo
   @Override
   public void confirm() {
     KbsPin userEntry = this.userEntry.getValue();
+    this.userEntry.setValue(KbsPin.EMPTY);
 
     if (pinToConfirm.toString().equals(userEntry.toString())) {
       this.label.setValue(Label.CREATING_PIN);
-      this.userEntry.setValue(KbsPin.EMPTY);
       this.saveAnimation.setValue(SaveAnimation.LOADING);
 
       repository.setPin(pinToConfirm, Preconditions.checkNotNull(this.keyboard.getValue()), this::handleResult);