diff --git a/ghost/admin/controllers/editor/new.js b/ghost/admin/controllers/editor/new.js
index ff3887ecf5..73ba0daf4a 100644
--- a/ghost/admin/controllers/editor/new.js
+++ b/ghost/admin/controllers/editor/new.js
@@ -11,9 +11,6 @@ var EditorNewController = Ember.ObjectController.extend(EditorControllerMixin, {
                 if (model.get('id')) {
                     self.transitionToRoute('editor.edit', model);
                 }
-            }).catch(function () {
-                // Publishing failed
-                self.set('status', 'draft');
             });
         }
     }
diff --git a/ghost/admin/mixins/editor-base-controller.js b/ghost/admin/mixins/editor-base-controller.js
index db2502ddd2..8700ffff15 100644
--- a/ghost/admin/mixins/editor-base-controller.js
+++ b/ghost/admin/mixins/editor-base-controller.js
@@ -211,6 +211,9 @@ var EditorControllerMixin = Ember.Mixin.create(MarkerManager, {
                 return model;
             }).catch(function (errors) {
                 self.showErrorNotification(prevStatus, self.get('status'), errors);
+
+                self.set('status', prevStatus);
+
                 return Ember.RSVP.reject(errors);
             });
         },