diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 29841261..c70c2232 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -208,14 +208,18 @@ const PostStatusForm = {
     })
   },
   watch: {
-    'newStatus.contentType': function () {
-      this.autoPreview()
-    },
-    'newStatus.spoilerText': function () {
-      this.autoPreview()
+    'newStatus': {
+      deep: true,
+      handler () {
+        this.statusChanged()
+      }
     }
   },
   methods: {
+    statusChanged () {
+      this.autoPreview()
+      this.updateIdempotencyKey()
+    },
     clearStatus () {
       const newStatus = this.newStatus
       this.newStatus = {
@@ -239,7 +243,6 @@ const PostStatusForm = {
       el.style.height = 'auto'
       el.style.height = undefined
       this.error = null
-      this.updateIdempotencyKey()
       if (this.preview) this.previewStatus()
     },
     async postStatus (event, newStatus, opts = {}) {
@@ -407,7 +410,6 @@ const PostStatusForm = {
       }
     },
     onEmojiInputInput (e) {
-      this.autoPreview()
       this.$nextTick(() => {
         this.resize(this.$refs['textarea'])
       })
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 812f74d5..f09196aa 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -30,10 +30,6 @@ const postStatus = ({
     idempotencyKey
   })
     .then((data) => {
-      return {
-        error: 'test'
-      }
-      /*
       if (!data.error && !preview) {
         store.dispatch('addNewStatuses', {
           statuses: [data],
@@ -43,7 +39,6 @@ const postStatus = ({
         })
       }
       return data
-      */
     })
     .catch((err) => {
       return {