diff --git a/app/controllers/application_controller/with_context.rb b/app/controllers/application_controller/with_context.rb
index 869b626611bdc3511d4d977654680404959c168d..7d5efa2153e7c13a27ce58b45004ab93ba54556d 100644
--- a/app/controllers/application_controller/with_context.rb
+++ b/app/controllers/application_controller/with_context.rb
@@ -4,11 +4,8 @@ module ApplicationController::WithContext
   included do
 
     def current_university
-      unless @current_university
-        @current_university = current_website ? current_website.university
+      @current_university ||= current_website ? current_website.university
                                               : University.with_host(request.host)
-      end
-      @current_university
     end
     helper_method :current_university