diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4fd4b27..10a116d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,6 +23,7 @@ def extract_locale_from_accept_language_header
   end
 
   def current_person
+    return nil if session[:account_id].blank?
     if session[:account_type] == "facebook_account"
       @current_user ||= FacebookAccount.find_by(id: session[:account_id]).person
     elsif session[:account_type] == "account"