diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 7606d2d0fbe..fdfe00dc135 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -7,12 +7,22 @@
 # For users who haven't customized the setting, we simply delegate to
 # `DashboardController#show`, which is the default.
 class RootController < DashboardController
+  before_action :redirect_to_custom_dashboard, only: [:show]
+
   def show
-    case current_user.try(:dashboard)
+    super
+  end
+
+  private
+
+  def redirect_to_custom_dashboard
+    return unless current_user
+
+    case current_user.dashboard
     when 'stars'
       redirect_to starred_dashboard_projects_path
     else
-      super
+      return
     end
   end
 end