diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 42a977f009..80d19e8dd3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,4 +27,8 @@ def deny_resource_access(exception)
       end
     end
   end
+
+  def guest_user
+    @guest_user ||= User.where(guest: true).first || super
+  end
 end