diff --git a/vendor/magento/module-company-graph-ql/Model/Company/Users/Formatter.php b/vendor/magento/module-company-graph-ql/Model/Company/Users/Formatter.php index b0aaf6534bae..63d883d48fe0 100644 --- a/vendor/magento/module-company-graph-ql/Model/Company/Users/Formatter.php +++ b/vendor/magento/module-company-graph-ql/Model/Company/Users/Formatter.php @@ -140,6 +140,9 @@ public function formatUser(CustomerInterface $user): array public function formatRole(int $userId): ?array { $companyId = $this->companyContextInterface->getCompanyId(); + if ($companyId === null) { + return null; + } $roles = $this->userRoleManagement->getRolesForCompanyUser($userId, $companyId); if (!$roles) { return null;