diff --git a/src/Oro/Bundle/DashboardBundle/Model/Manager.php b/src/Oro/Bundle/DashboardBundle/Model/Manager.php index 39b9f4a09c4..64abb08e363 100644 --- a/src/Oro/Bundle/DashboardBundle/Model/Manager.php +++ b/src/Oro/Bundle/DashboardBundle/Model/Manager.php @@ -206,12 +206,17 @@ public function remove(EntityModelInterface $entityModel) /** * Find active dashboard or default dashboard * - * @param User $user + * @param User|null $user * * @return DashboardModel|null */ - public function findUserActiveOrDefaultDashboard(User $user) + public function findUserActiveOrDefaultDashboard(?User $user) { + // No user, no way to determine dashboard. Even findDefaultDashboard requires proper user token. + if ($user === null) { + return null; + } + $activeDashboard = $this->findUserActiveDashboard($user); return $activeDashboard ? $activeDashboard : $this->findDefaultDashboard(); }