diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index f5f44467c..ffc3671ad 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -58,10 +58,6 @@ const Draft = {
     },
     hideConfirmDialog () {
       this.showingConfirmDialog = false
-    },
-    handlePosted () {
-      console.debug('posted')
-      this.doAbandon()
     }
   }
 }
diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue
index 43b14721d..cc385c143 100644
--- a/src/components/draft/draft.vue
+++ b/src/components/draft/draft.vue
@@ -48,12 +48,10 @@
       <PostStatusForm
         v-if="draft.type !== 'edit'"
         v-bind="postStatusFormProps"
-        @posted="handlePosted"
       />
       <EditStatusForm
         v-else
         :params="postStatusFormProps"
-        @posted="handlePosted"
       />
     </div>
     <teleport to="#modal">
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index f6e200660..8cfcec649 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -418,6 +418,7 @@ const PostStatusForm = {
 
       postHandler(postingOptions).then((data) => {
         if (!data.error) {
+          this.abandonDraft()
           this.clearStatus()
           this.$emit('posted', data)
         } else {
@@ -707,6 +708,9 @@ const PostStatusForm = {
           })
       }
     },
+    abandonDraft () {
+      this.$store.dispatch('abandonDraft', { id: this.newStatus.id })
+    },
     getDraft (statusType, refId) {
       console.debug('type and ref:', [statusType, refId])