diff --git a/client/src/app/(main)/[username]/profile/lib/useGetUserByName.ts b/client/src/app/(main)/[username]/profile/lib/useGetUserByName.ts
index 7494344b..759e171d 100644
--- a/client/src/app/(main)/[username]/profile/lib/useGetUserByName.ts
+++ b/client/src/app/(main)/[username]/profile/lib/useGetUserByName.ts
@@ -4,5 +4,5 @@ import { IUserResponse } from '@teameights/types';
 export const useGetUserByName = (username: string): { data: IUserResponse | undefined } => {
   const users = useGetUsers(JSON.stringify({ username: username }));
 
-  return { data: users?.data?.pages[0]?.data[0] ?? undefined };
+  return { data: users?.data?.pages[0]?.data[0] };
 };
diff --git a/client/src/app/(main)/[username]/profile/ui/fields/skills.tsx b/client/src/app/(main)/[username]/profile/ui/fields/skills.tsx
index d011f5ac..71577a7b 100644
--- a/client/src/app/(main)/[username]/profile/ui/fields/skills.tsx
+++ b/client/src/app/(main)/[username]/profile/ui/fields/skills.tsx
@@ -8,7 +8,7 @@ export const Skills = () => {
   const { data: user } = useGetUserByName(username as string);
   const skills = {
     coreTools: {
-      badge: BadgeIcon,
+      badge: ( {  data }: { data: string }) => <BadgeIcon data={data} isActive={true} />,
       title: 'Core Tools',
     },
     additionalTools: {
@@ -16,10 +16,9 @@ export const Skills = () => {
       title: 'Additional Tools',
     },
   };
-
   return (
     <Flex gap='24px' direction='column'>
-      {user?.skills &&
+      {user!.skills &&
         Object.entries(skills).map(skill => {
           const skillName = skill[0] as keyof typeof skills;
           const Badge = skills[skillName].badge;
@@ -27,7 +26,7 @@ export const Skills = () => {
             <Flex key={skillName} direction='column' gap='8px'>
               <Typography>{skills[skillName].title}</Typography>
               <Flex wrap='wrap' gap='8px'>
-                {user?.skills?.coreTools.map((lang: string) => <Badge key={lang} data={lang} />)}
+                {user?.skills![skillName]?.map((lang: string) => <Badge key={lang} data={lang} />)}
               </Flex>
             </Flex>
           );