diff --git a/app/controllers/moderator/post/queues_controller.rb b/app/controllers/moderator/post/queues_controller.rb
index 94bfb9171..51ed8a670 100644
--- a/app/controllers/moderator/post/queues_controller.rb
+++ b/app/controllers/moderator/post/queues_controller.rb
@@ -22,8 +22,14 @@ module Moderator
         cookies.permanent[:moderated] = Time.now.to_i
 
         ::Post.without_timeout do
-          @posts = ::Post.order("posts.id asc").pending_or_flagged.available_for_moderation(false).reorder("random()").limit(5)
+          @posts = ::Post.order("posts.id asc").where("false").pending_or_flagged.available_for_moderation(false).reorder("random()").limit(5)
           @posts.each # hack to force rails to eager load
+
+          if @posts.empty?
+            flash[:notice] = "Nothing left to moderate!"
+            redirect_to(params[:return_to] || posts_path)
+            return
+          end
         end
 
         respond_with(@posts)