diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
index f14f84a..1fab7bc 100644
--- a/app/Http/Controllers/Api/UserController.php
+++ b/app/Http/Controllers/Api/UserController.php
@@ -40,7 +40,7 @@ public function update(int $id, UserUpdateDTO $userUpdateDTO): array|JsonRespons
 
     public function team(int $id): array
     {
-        $teams = User::query()->findOrFail($id);
+        $teams = User::query()->find($id);
 
         return $this->userService->team($teams);
     }
diff --git a/app/Services/Api/UserService.php b/app/Services/Api/UserService.php
index 2712a33..cabad1a 100644
--- a/app/Services/Api/UserService.php
+++ b/app/Services/Api/UserService.php
@@ -72,11 +72,15 @@ public function update(User|null $user, UserUpdateDTO $userUpdateDTO): array|Jso
         return response()->json(['message' => 'just meme'], 403);
     }
 
-    public function team(User $user): array
+    public function team(User|null $user): array
     {
-        $team = $user->teams()->get();
+        if($user) {
+            $team = $user->teams()->get();
 
-        return UserTeamDTO::collect($team)->toArray();
+            return UserTeamDTO::collect($team)->toArray();
+        }
+
+        return [];
     }
 
     public function teamIsCaptain(User $user): array