diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e996789f1..6b26103ef 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -690,6 +690,7 @@ const PostStatusForm = {
         .then((data) => {
           this.abandonDraft()
           this.clearStatus()
+          this.updateIdempotencyKey()
           this.$emit('posted', data)
         })
         .catch((error) => {
@@ -1007,6 +1008,7 @@ const PostStatusForm = {
               this.saveable = false
               if (!this.shouldAutoSaveDraft) {
                 this.clearStatus()
+                this.updateIdempotencyKey()
                 this.$emit('draft-done')
               }
             })
@@ -1016,6 +1018,7 @@ const PostStatusForm = {
             this.saveable = false
             if (!this.shouldAutoSaveDraft) {
               this.clearStatus()
+              this.updateIdempotencyKey()
               this.$emit('draft-done')
             }
           })