diff --git a/apps/hackathon/src/app/dashboard/page.tsx b/apps/hackathon/src/app/dashboard/page.tsx
index e14b7ba..27a597e 100644
--- a/apps/hackathon/src/app/dashboard/page.tsx
+++ b/apps/hackathon/src/app/dashboard/page.tsx
@@ -131,8 +131,7 @@ const DashboardPage: FC = (): ReactElement => {
 
         {myTeams.length > 0 ? (
           (() => {
-            const item = myTeams[0] as any;
-            const team = item.team || item;
+            const team = myTeams[0] as any;
             return (
               <div className="mb-6 md:mb-8">
                 <h2 className="text-xl md:text-2xl font-bold text-gray-900 dark:text-white mb-3 md:mb-4">
diff --git a/apps/hackathon/src/app/users/[userId]/page.tsx b/apps/hackathon/src/app/users/[userId]/page.tsx
index 76f7ff1..ac13860 100644
--- a/apps/hackathon/src/app/users/[userId]/page.tsx
+++ b/apps/hackathon/src/app/users/[userId]/page.tsx
@@ -131,61 +131,58 @@ const UserProfilePage: FC = (): ReactElement => {
                   Team
                 </h2>
                 <div className="space-y-4">
-                  {userTeams.map((item: any) => {
-                    const team = item.team || item;
-                    return (
-                      <Link
-                        key={team.id}
-                        to={'/teams/' + team.id}
-                        className="block bg-white dark:bg-gray-800 rounded-lg shadow-md dark:shadow-gray-950/50 overflow-hidden hover:shadow-lg transition-shadow border dark:border-gray-700"
-                      >
-                        <img
-                          src={team.banner || '/images/banner-imphnen.webp'}
-                          alt={team.name}
-                          className="w-full aspect-3/1 object-cover"
-                        />
-                        <div className="p-4">
-                          <div className="flex items-center space-x-3 mb-3">
-                            {team.logo ? (
-                              <img
-                                src={team.logo}
-                                alt={team.name}
-                                className="w-12 h-12 rounded-full object-cover"
-                              />
-                            ) : (
-                              <div className="w-12 h-12 rounded-full bg-gray-200 dark:bg-gray-700 flex items-center justify-center">
-                                <Icon icon="mdi:account-group" className="text-gray-500 dark:text-gray-400 text-xl" />
-                              </div>
-                            )}
-                            <div className="flex-1 min-w-0">
-                              <h3 className="font-bold text-gray-900 dark:text-white line-clamp-1 text-lg">
-                                {team.name}
-                              </h3>
-                              <div className="text-sm text-gray-600 dark:text-gray-400 flex items-center gap-3 font-sans mt-1">
-                                {team.has_submission && (
-                                  <span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 shrink-0">
-                                    <Icon icon="mdi:check-circle" className="text-sm" />
-                                    Submitted
-                                  </span>
-                                )}
-                                {team.city && (
-                                  <span className="flex items-center gap-1 truncate">
-                                    <Icon icon="mdi:map-marker" className="shrink-0" />
-                                    <span className="truncate">{team.city}</span>
-                                  </span>
-                                )}
-                              </div>
+                  {userTeams.map((team: any) => (
+                    <Link
+                      key={team.id}
+                      to={'/teams/' + team.id}
+                      className="block bg-white dark:bg-gray-800 rounded-lg shadow-md dark:shadow-gray-950/50 overflow-hidden hover:shadow-lg transition-shadow border dark:border-gray-700"
+                    >
+                      <img
+                        src={team.banner || '/images/banner-imphnen.webp'}
+                        alt={team.name}
+                        className="w-full aspect-3/1 object-cover"
+                      />
+                      <div className="p-4">
+                        <div className="flex items-center space-x-3 mb-3">
+                          {team.logo ? (
+                            <img
+                              src={team.logo}
+                              alt={team.name}
+                              className="w-12 h-12 rounded-full object-cover"
+                            />
+                          ) : (
+                            <div className="w-12 h-12 rounded-full bg-gray-200 dark:bg-gray-700 flex items-center justify-center">
+                              <Icon icon="mdi:account-group" className="text-gray-500 dark:text-gray-400 text-xl" />
+                            </div>
+                          )}
+                          <div className="flex-1 min-w-0">
+                            <h3 className="font-bold text-gray-900 dark:text-white line-clamp-1 text-lg">
+                              {team.name}
+                            </h3>
+                            <div className="text-sm text-gray-600 dark:text-gray-400 flex items-center gap-3 font-sans mt-1">
+                              {team.has_submission && (
+                                <span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 shrink-0">
+                                  <Icon icon="mdi:check-circle" className="text-sm" />
+                                  Submitted
+                                </span>
+                              )}
+                              {team.city && (
+                                <span className="flex items-center gap-1 truncate">
+                                  <Icon icon="mdi:map-marker" className="shrink-0" />
+                                  <span className="truncate">{team.city}</span>
+                                </span>
+                              )}
                             </div>
                           </div>
-                          {team.description && (
-                            <p className="text-gray-600 dark:text-gray-400 text-sm line-clamp-2 font-sans">
-                              {team.description}
-                            </p>
-                          )}
                         </div>
-                      </Link>
-                    );
-                  })}
+                        {team.description && (
+                          <p className="text-gray-600 dark:text-gray-400 text-sm line-clamp-2 font-sans">
+                            {team.description}
+                          </p>
+                        )}
+                      </div>
+                    </Link>
+                  ))}
                 </div>
               </div>
             ) : (
diff --git a/libs/service/src/hooks/teams/index.ts b/libs/service/src/hooks/teams/index.ts
index b0cf0f3..57626a5 100644
--- a/libs/service/src/hooks/teams/index.ts
+++ b/libs/service/src/hooks/teams/index.ts
@@ -434,8 +434,11 @@ export const useMyTeams = () => {
   return useQuery({
     queryKey: teamKeys.myTeams(),
     queryFn: async () => {
-      const response = await hackathonApi.get<HackathonApiResponse<Team[]>>('/teams/my');
-      return { data: response.data.data || [] };
+      const response = await hackathonApi.get<HackathonApiResponse<any[]>>('/teams/my');
+      const rawData = response.data.data || [];
+      // Unwrap nested team data if present (API returns [{team: {...}}] or [{id, name, ...}])
+      const teams = rawData.map((item: any) => item.team || item);
+      return { data: teams };
     },
     enabled: !!session?.user?.id,
   });
@@ -555,8 +558,11 @@ export const useTeamsByUserId = (userId: string) => {
   return useQuery({
     queryKey: ['teams-by-user', userId],
     queryFn: async () => {
-      const response = await hackathonApi.get<HackathonApiResponse<Team[]>>(`/users/${userId}/teams`);
-      return { data: response.data.data || [] };
+      const response = await hackathonApi.get<HackathonApiResponse<any[]>>(`/users/${userId}/teams`);
+      const rawData = response.data.data || [];
+      // Unwrap nested team data if present (API returns [{team: {...}}] or [{id, name, ...}])
+      const teams = rawData.map((item: any) => item.team || item);
+      return { data: teams };
     },
     enabled: !!userId,
   });