diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 40710fb98..75004399c 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -59,7 +59,9 @@ class PostsController < ApplicationController
   def update
     params.require(:post)
 
-    post = Post.where(id: params[:id]).first
+    post = Post.where(id: params[:id])
+    post = post.with_deleted if guardian.is_staff?
+    post = post.first
     post.image_sizes = params[:image_sizes] if params[:image_sizes].present?
     guardian.ensure_can_edit!(post)
 
diff --git a/app/models/post_alert_observer.rb b/app/models/post_alert_observer.rb
index 2440ec25d..6c458ac1d 100644
--- a/app/models/post_alert_observer.rb
+++ b/app/models/post_alert_observer.rb
@@ -49,6 +49,7 @@ class PostAlertObserver < ActiveRecord::Observer
   def after_create_post_revision(post_revision)
     post = post_revision.post
 
+    return unless post
     return if post_revision.user.blank?
     return if post_revision.user_id == post.user_id
     return if post.topic.private_message?