diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index eda00b144..3216fdf4c 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -111,9 +111,7 @@ class PhotosController < ApplicationController
       respond_with @photo
     else
       flash[:error] = I18n.t 'photos.update.error'
-      @album = @photo.album
-      set_friends_and_status
-      render :edit
+      redirect_to [:edit, @photo]
     end
   end
 end