diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4c2706ad4ffa0558bd26b3f2c50beaf40f2e580a..5ecbca255f8e9ce29021aed69cf1e524b2806d1d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
                 :open_publisher
 
   def ensure_http_referer_is_set
-    request.env['HTTP_REFERER'] ||= '/stream'
+    request.env['HTTP_REFERER'] ||= root_path
   end
 
   # Overwriting the sign_out redirect path method
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index 6893dff4ad7d058f0eae6117c78089cedde1dfc1..7d974aa52cc362202f663dbb933121533a6f8971 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -135,7 +135,7 @@ describe PhotosController do
       it "redirects to the aspects page if there's no referrer" do
         request.env.delete("HTTP_REFERER")
         get :show, :id => @photo.to_param
-        response.should redirect_to(aspects_path)
+        response.should redirect_to(root_path)
       end
       
       it 'redirects to the sign in page if not logged in' do