diff --git a/client/src/components/chat/chat-area.tsx b/client/src/components/chat/chat-area.tsx
index 7b7f164..c95b3af 100644
--- a/client/src/components/chat/chat-area.tsx
+++ b/client/src/components/chat/chat-area.tsx
@@ -1,11 +1,20 @@
 import React, { useEffect, useRef, useState } from 'react'
-import { Edit, LogOut, Menu, MoreVertical, Send, SmilePlus, Trash2 } from 'lucide-react'
+import {
+  Edit,
+  LogOut,
+  Menu,
+  MoreVertical,
+  Send,
+  SmilePlus,
+  Trash2,
+} from 'lucide-react'
+import { formatDistanceToNow } from 'date-fns'
+import { emojiCategories, flatEmojiList } from './chat-emoji'
 import type { Message } from '@/lib/types'
 import { Avatar, AvatarFallback } from '@/components/ui/avatar'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { DotPattern } from '@/components/ui/dot-pattern'
-import { formatDistanceToNow } from 'date-fns'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -16,7 +25,7 @@ import { ScrollArea } from '@/components/ui/scroll-area'
 import { Textarea } from '@/components/ui/textarea'
 import { Input } from '@/components/ui/input'
 import { cn } from '@/lib/utils'
-import { useChat } from '@/context/chat-context'
+import { useChat, useOnlineUsers } from '@/context/chat-context'
 import { useUser } from '@/context/user-context'
 import {
   Dialog,
@@ -26,7 +35,6 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/components/ui/dialog'
-import { flatEmojiList, emojiCategories } from './chat-emoji'
 
 interface ChatAreaProps {
   setIsMobileMenuOpen: (open: boolean) => void
@@ -34,6 +42,7 @@ interface ChatAreaProps {
 
 export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
   const { user } = useUser()
+  const onlineUserIds = useOnlineUsers()
   const {
     selectedChat,
     messages,
@@ -57,15 +66,17 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
 
   const currentChatMessages = selectedChat ? messages[selectedChat.id] : []
 
-  type EmojiCategory = keyof typeof emojiCategories;
+  type EmojiCategory = keyof typeof emojiCategories
 
-  const [selectedCategory, setSelectedCategory] = useState<EmojiCategory | 'all'>('all');
+  const [selectedCategory, setSelectedCategory] = useState<
+    EmojiCategory | 'all'
+  >('all')
   const getFilteredEmojis = () => {
     if (selectedCategory === 'all') {
-      return flatEmojiList;
+      return flatEmojiList
     }
-    return emojiCategories[selectedCategory] || [];
-  };
+    return emojiCategories[selectedCategory] || []
+  }
 
   useEffect(() => {
     if (chatAreaScrollDown) {
@@ -190,6 +201,8 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
     (p) => user && p.id === user.id,
   )
 
+  console.log(selectedChat)
+
   return (
     <div className="flex flex-1 flex-col bg-white md:border md:border-input md:rounded-2xl">
       {/* Mobile menu toggle */}
@@ -204,13 +217,20 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
 
       <div className="flex gap-5 p-4">
         {/* Avatar */}
-        <Avatar>
-          {/* Uncomment if you have avatar URLs */}
-          {/* <AvatarImage src={selectedChat.isGroup ? selectedChat.avatar : otherUser?.avatar} alt="avatar" /> */}
-          <AvatarFallback>
-            {selectedChat.name ? selectedChat.name.charAt(0) : '?'}
-          </AvatarFallback>
-        </Avatar>
+        <div className="relative">
+          <Avatar className="h-8 w-8">
+            <AvatarFallback>
+              {selectedChat.name ? selectedChat.name.charAt(0) : '?'}
+            </AvatarFallback>
+            {selectedChat.participants.some(
+              (p) =>
+                p.id !== user?.id &&
+                onlineUserIds.some((onlineUser) => onlineUser.id === p.id),
+            ) && (
+              <div className="absolute inset-0 rounded-full border-2 border-green-500" />
+            )}
+          </Avatar>
+        </div>
 
         {/* Chat Info */}
         <div className="flex items-center justify-between w-full">
@@ -264,13 +284,21 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
                               }}
                             >
                               <div className="flex items-center gap-2">
-                                <Avatar>
-                                  <AvatarFallback>
-                                    {participant.username
-                                      ? participant.username.charAt(0)
-                                      : '?'}
-                                  </AvatarFallback>
-                                </Avatar>
+                                <div className="relative">
+                                  <Avatar>
+                                    <AvatarFallback>
+                                      {participant.username
+                                        ? participant.username.charAt(0)
+                                        : '?'}
+                                    </AvatarFallback>
+                                  </Avatar>
+                                  {onlineUserIds.some(
+                                    (onlineUser) =>
+                                      onlineUser.id === participant.id,
+                                  ) && (
+                                    <div className="absolute inset-0 rounded-full border-2 border-green-500" />
+                                  )}
+                                </div>
                                 {participant.username.length > 10
                                   ? `${participant.username.slice(0, 10)}...`
                                   : participant.username}
@@ -291,9 +319,9 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
                                   className={cn(
                                     'ml-2 text-xs',
                                     participant.role === 'admin' &&
-                                    'bg-red-100 text-red-700',
+                                      'bg-red-100 text-red-700',
                                     participant.role === 'member' &&
-                                    'bg-blue-100 text-blue-700',
+                                      'bg-blue-100 text-blue-700',
                                   )}
                                 >
                                   {participant.role}
@@ -372,14 +400,26 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
                 >
                   {message.senderType === 'user' ? (
                     <div
-                      className={`max-w-[70%] ${isCurrentUser
-                        ? 'rounded-lg bg-primary text-white'
-                        : 'rounded-lg bg-gray-100 text-gray-900'
-                        } overflow-hidden`}
+                      className={`max-w-[70%] ${
+                        isCurrentUser
+                          ? 'rounded-lg bg-primary text-white'
+                          : 'rounded-lg bg-gray-100 text-gray-900'
+                      } overflow-hidden`}
                     >
                       {!isCurrentUser && selectedChat.isGroup && (
                         <div className="border-b border-gray-200 px-4 py-2 text-xs font-medium">
-                          {sender?.username || 'Unknown user'}
+                          <div className="flex items-center gap-2">
+                            <div
+                              className={`h-2 w-2 rounded-full ${
+                                onlineUserIds.some(
+                                  (onlineUser) => onlineUser.id === sender?.id,
+                                )
+                                  ? 'bg-green-500'
+                                  : 'bg-gray-300'
+                              }`}
+                            />
+                            {sender?.username || 'Unknown user'}
+                          </div>
                         </div>
                       )}
 
@@ -523,18 +563,15 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
               </Button>
             </DropdownMenuTrigger>
 
-            <DropdownMenuContent
-              className="mb-2 "
-              align="end"
-              side="top"
-            >
+            <DropdownMenuContent className="mb-2 " align="end" side="top">
               <div className="max-w-[420px] overflow-x-auto whitespace-nowrap pb-2 flex space-x-2">
                 <Button
                   onClick={() => setSelectedCategory('all')}
-                  className={`shrink-0 ${selectedCategory === 'all'
-                    ? 'bg-blue-500 text-white'
-                    : 'bg-gray-200 text-gray-600 hover:text-black'
-                    }`}
+                  className={`shrink-0 ${
+                    selectedCategory === 'all'
+                      ? 'bg-blue-500 text-white'
+                      : 'bg-gray-200 text-gray-600 hover:text-black'
+                  }`}
                 >
                   All
                 </Button>
@@ -542,24 +579,29 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
                 {Object.keys(emojiCategories).map((category) => (
                   <Button
                     key={category}
-                    onClick={() => setSelectedCategory(category as EmojiCategory)}
-                    className={`shrink-0 ${selectedCategory === category
-                      ? 'bg-blue-500 text-white'
-                      : 'bg-gray-200 text-gray-600 hover:text-black'
-                      }`}
+                    onClick={() =>
+                      setSelectedCategory(category as EmojiCategory)
+                    }
+                    className={`shrink-0 ${
+                      selectedCategory === category
+                        ? 'bg-blue-500 text-white'
+                        : 'bg-gray-200 text-gray-600 hover:text-black'
+                    }`}
                   >
                     {category.charAt(0).toUpperCase() + category.slice(1)}
                   </Button>
                 ))}
               </div>
-              <div className='grid grid-cols-10 gap-1 overflow-y-auto min-h-50 max-h-50'>
+              <div className="grid grid-cols-10 gap-1 overflow-y-auto min-h-50 max-h-50">
                 {getFilteredEmojis().map((emoji, i) => (
-                  <DropdownMenuItem key={i} onClick={() => setMessageText(messageText + emoji)}>
+                  <DropdownMenuItem
+                    key={i}
+                    onClick={() => setMessageText(messageText + emoji)}
+                  >
                     {emoji}
                   </DropdownMenuItem>
                 ))}
               </div>
-
             </DropdownMenuContent>
           </DropdownMenu>
           <Button
@@ -572,6 +614,6 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
           </Button>
         </form>
       </div>
-    </div >
+    </div>
   )
 }
diff --git a/client/src/components/chat/chat-sidebar.tsx b/client/src/components/chat/chat-sidebar.tsx
index 49f5f7c..762a5d3 100644
--- a/client/src/components/chat/chat-sidebar.tsx
+++ b/client/src/components/chat/chat-sidebar.tsx
@@ -10,6 +10,7 @@ import {
   X,
 } from 'lucide-react'
 import { useQuery } from '@tanstack/react-query'
+import { formatDistanceToNow } from 'date-fns'
 import type { User } from '@/lib/types'
 import { Button } from '@/components/ui/button'
 import {
@@ -27,8 +28,7 @@ import { Avatar, AvatarFallback } from '@/components/ui/avatar'
 import { Badge } from '@/components/ui/badge'
 import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { useUser } from '@/context/user-context'
-import { useChat } from '@/context/chat-context'
-import { formatDistanceToNow } from 'date-fns'
+import { useChat, useOnlineUsers } from '@/context/chat-context'
 
 interface ChatSidebarProps {
   isMobileMenuOpen: boolean
@@ -40,7 +40,15 @@ export default function ChatSidebar({
   setIsMobileMenuOpen,
 }: ChatSidebarProps) {
   const { user: currentUser, updateUsername, logout } = useUser()
-  const { chats, selectedChat, selectChat, createDirect, createGroup, joinGroup } = useChat()
+  const {
+    chats,
+    selectedChat,
+    selectChat,
+    createDirect,
+    createGroup,
+    joinGroup,
+  } = useChat()
+  const onlineUserIds = useOnlineUsers()
 
   const [searchQuery, setSearchQuery] = useState('')
   const [newGroupName, setNewGroupName] = useState('')
@@ -108,11 +116,13 @@ export default function ChatSidebar({
 
   const filteredChats = chats.filter((chat) => {
     const resolvedName = chat.isGroup
-      ? chat.name ?? ''
-      : chat.participants?.find(p => currentUser && p.id !== currentUser.id)?.username ?? '';
+      ? (chat.name ?? '')
+      : (chat.participants?.find((p) => currentUser && p.id !== currentUser.id)
+          ?.username ?? '')
 
-
-    const matchesSearch = resolvedName.toLowerCase().includes(searchQuery.toLowerCase())
+    const matchesSearch = resolvedName
+      .toLowerCase()
+      .includes(searchQuery.toLowerCase())
     let matchesType = true
     if (chatTypeFilter !== 'all') {
       matchesType = chatTypeFilter === 'group' ? chat.isGroup : !chat.isGroup
@@ -132,18 +142,24 @@ export default function ChatSidebar({
 
       {/* Sidebar */}
       <div
-        className={`${isMobileMenuOpen ? 'translate-x-0 pt-14' : '-translate-x-full'
-          } fixed inset-y-0 left-0 z-40 w-80 transform md:border md:border-input bg-white md:rounded-2xl transition-transform duration-300 ease-in-out md:relative md:translate-x-0`}
+        className={`${
+          isMobileMenuOpen ? 'translate-x-0 pt-14' : '-translate-x-full'
+        } fixed inset-y-0 left-0 z-40 w-80 transform md:border md:border-input bg-white md:rounded-2xl transition-transform duration-300 ease-in-out md:relative md:translate-x-0`}
       >
         <div className="flex h-full flex-col">
           {/* User profile */}
           <div className="flex items-center justify-between border-b p-4">
             <div className="flex items-center space-x-3">
-              <Avatar>
-                <AvatarFallback>
-                  {currentUser?.username ? currentUser.username.charAt(0) : '?'}
-                </AvatarFallback>
-              </Avatar>
+              <div className="relative">
+                <Avatar className='h-8 w-8'>
+                  <AvatarFallback>
+                    {currentUser?.username
+                      ? currentUser.username.charAt(0)
+                      : '?'}
+                  </AvatarFallback>
+                </Avatar>
+                <div className="absolute inset-0 rounded-full border-2 border-green-500" />
+              </div>
               <div>
                 <h3 className="font-medium">{currentUser?.username}</h3>
                 <p className="text-xs text-gray-500">{currentUser?.email}</p>
@@ -227,9 +243,7 @@ export default function ChatSidebar({
                     <div className="max-h-60 space-y-2 overflow-y-auto rounded-md border p-2">
                       {users
                         ?.filter(
-                          (user) =>
-                            currentUser &&
-                            user.id !== currentUser.id,
+                          (user) => currentUser && user.id !== currentUser.id,
                         )
                         .map((user) => (
                           <div
@@ -242,11 +256,18 @@ export default function ChatSidebar({
                             }}
                           >
                             <div className="flex items-center space-x-3">
-                              <Avatar className="h-8 w-8">
-                                <AvatarFallback>
-                                  {user.username.charAt(0)}
-                                </AvatarFallback>
-                              </Avatar>
+                              <div className="relative">
+                                <Avatar className="h-8 w-8">
+                                  <AvatarFallback>
+                                    {user.username.charAt(0)}
+                                  </AvatarFallback>
+                                </Avatar>
+                                {onlineUserIds.some(
+                                  (onlineUser) => onlineUser.id === user.id,
+                                ) && (
+                                  <div className="absolute inset-0 rounded-full border-2 border-green-500" />
+                                )}
+                              </div>
                               <div>
                                 <p className="text-sm font-medium">
                                   {user.username}
@@ -291,25 +312,32 @@ export default function ChatSidebar({
                       <div className="max-h-60 space-y-2 overflow-y-auto rounded-md border p-2">
                         {users
                           ?.filter(
-                            (user) =>
-                              currentUser &&
-                              user.id !== currentUser.id,
+                            (user) => currentUser && user.id !== currentUser.id,
                           )
                           .map((user) => (
                             <div
                               key={user.id}
-                              className={`flex cursor-pointer items-center justify-between rounded-md p-2 ${selectedUsers.some((u) => u.id === user.id)
-                                ? 'bg-gray-100'
-                                : ''
-                                }`}
+                              className={`flex cursor-pointer items-center justify-between rounded-md p-2 ${
+                                selectedUsers.some((u) => u.id === user.id)
+                                  ? 'bg-gray-100'
+                                  : ''
+                              }`}
                               onClick={() => toggleUserSelection(user)}
                             >
                               <div className="flex items-center space-x-3">
-                                <Avatar className="h-8 w-8">
-                                  <AvatarFallback>
-                                    {user.username.charAt(0)}
-                                  </AvatarFallback>
-                                </Avatar>
+                                <div className="relative">
+                                  <Avatar className="h-8 w-8">
+                                    <AvatarFallback>
+                                      {user.username.charAt(0)}
+                                    </AvatarFallback>
+                                  </Avatar>
+                                  {/* Green ring for online status */}
+                                  {onlineUserIds.some(
+                                    (onlineUser) => onlineUser.id === user.id,
+                                  ) && (
+                                    <div className="absolute inset-0 rounded-full border-2 border-green-500" />
+                                  )}
+                                </div>
                                 <div>
                                   <p className="text-sm font-medium">
                                     {user.username}
@@ -330,7 +358,9 @@ export default function ChatSidebar({
                       <Button
                         className="w-full"
                         onClick={handleCreateGroup}
-                        disabled={!newGroupName.trim() || selectedUsers.length === 0}
+                        disabled={
+                          !newGroupName.trim() || selectedUsers.length === 0
+                        }
                       >
                         Create Group
                       </Button>
@@ -360,9 +390,11 @@ export default function ChatSidebar({
                         onChange={(e) => setGroupIdToJoin(e.target.value)}
                       />
                     </div>
-                    <DialogClose className="w-full bg-blue-700 text-white rounded-md p-2 text-center hover:bg-blue-600 transition-colors duration-200 ease-in-out" 
+                    <DialogClose
+                      className="w-full bg-blue-700 text-white rounded-md p-2 text-center hover:bg-blue-600 transition-colors duration-200 ease-in-out"
                       onClick={handleJoinGroup}
-                      disabled={!groupIdToJoin.trim()}>
+                      disabled={!groupIdToJoin.trim()}
+                    >
                       Join Group
                     </DialogClose>
                   </div>
@@ -383,51 +415,88 @@ export default function ChatSidebar({
           <ScrollArea className="flex-1 overflow-auto">
             <div className="space-y-1 p-2">
               {filteredChats.length > 0 ? (
-                filteredChats.map((chat) => (
-                  <div
-                    key={chat.id}
-                    className={`flex cursor-pointer items-center justify-between rounded-md p-3 ${selectedChat?.id === chat.id
-                      ? 'bg-gray-100'
-                      : 'hover:bg-gray-50'
-                      }`}
-                    onClick={() => {
-                      selectChat(chat)
-                      setIsMobileMenuOpen(false)
-                    }}
-                  >
-                    <div className="flex items-center space-x-3">
-                      <Avatar>
-                        <AvatarFallback>
-                          {chat.name ? chat.name.charAt(0) : '?'}
-                        </AvatarFallback>
-                      </Avatar>
+                filteredChats.map((chat) => {
+                  const otherParticipant = !chat.isGroup
+                    ? chat.participants?.find(
+                        (p) => currentUser && p.id !== currentUser.id,
+                      )
+                    : null
+
+                  const isDirectOnline = otherParticipant
+                    ? onlineUserIds.some((u) => u.id === otherParticipant.id)
+                    : false
 
-                      <div>
-                        <div className="flex items-center">
-                          <h3 className="font-medium">{chat.name}</h3>
-                          {chat.isGroup && (
-                            <Badge className="ml-2 bg-blue-100 text-blue-700 text-xs">
-                              Group
-                            </Badge>
-                          )}
+                  const isGroupOnline = chat.isGroup
+                    ? chat.participants?.some(
+                        (p) =>
+                          p.id !== currentUser?.id &&
+                          onlineUserIds.some(
+                            (onlineUser) => onlineUser.id === p.id,
+                          ),
+                      )
+                    : false
+
+                  return (
+                    <div
+                      key={chat.id}
+                      className={`flex cursor-pointer items-center justify-between rounded-md p-3 ${
+                        selectedChat?.id === chat.id
+                          ? 'bg-gray-100'
+                          : 'hover:bg-gray-50'
+                      }`}
+                      onClick={() => {
+                        selectChat(chat)
+                        setIsMobileMenuOpen(false)
+                      }}
+                    >
+                      <div className="flex items-center space-x-3">
+                        <div className="relative">
+                          <div className="relative">
+                            <Avatar
+                              className={
+                                isDirectOnline || isGroupOnline
+                                  ? 'border-2 border-transparent'
+                                  : ''
+                              }
+                            >
+                              <AvatarFallback>
+                                {chat.name ? chat.name.charAt(0) : '?'}
+                              </AvatarFallback>
+                            </Avatar>
+                            {(isDirectOnline || isGroupOnline) && (
+                              <div className="absolute inset-0 rounded-full border-2 border-green-500" />
+                            )}
+                          </div>
+                        </div>
+                        <div>
+                          <div className="flex items-center">
+                            <h3 className="font-medium">{chat.name}</h3>
+                            {chat.isGroup && (
+                              <Badge className="ml-2 bg-blue-100 text-blue-700 text-xs">
+                                Group
+                              </Badge>
+                            )}
+                          </div>
+                          <p className="text-sm text-gray-500 line-clamp-1">
+                            {chat.lastMessage}
+                          </p>
                         </div>
-                        <p className="text-sm text-gray-500 line-clamp-1">
-                          {chat.lastMessage}
-                        </p>
+                      </div>
+                      <div className="flex flex-col self-start items-end space-y-1">
+                        <span className="text-xs text-gray-500">
+                          {chat.lastSentAt
+                            ? formatDistanceToNow(chat.lastSentAt)
+                            : ''}
+                        </span>
+                        {chat.unread > 0 && (
+                          <Badge className="h-5 w-5 rounded-full p-0 flex items-center justify-center bg-red-500">
+                            {chat.unread}
+                          </Badge>
+                        )}
                       </div>
                     </div>
-                    <div className="flex flex-col self-start items-end space-y-1">
-                      <span className="text-xs text-gray-500">
-                        {chat.lastSentAt ? formatDistanceToNow(chat.lastSentAt) : ''}
-                      </span>
-                      {chat.unread > 0 && (
-                        <Badge className="h-5 w-5 rounded-full p-0 flex items-center justify-center bg-red-500">
-                          {chat.unread}
-                        </Badge>
-                      )}
-                    </div>
-                  </div>
-                ))
+                  )
+                })
               ) : (
                 <div className="p-4 text-center text-gray-500">
                   No conversations found
@@ -439,4 +508,4 @@ export default function ChatSidebar({
       </div>
     </>
   )
-}
\ No newline at end of file
+}
diff --git a/client/src/context/chat-context.tsx b/client/src/context/chat-context.tsx
index e7dc2f3..c3a1fdb 100644
--- a/client/src/context/chat-context.tsx
+++ b/client/src/context/chat-context.tsx
@@ -32,6 +32,7 @@ interface ChatContextType {
 }
 
 const ChatContext = createContext<ChatContextType | undefined>(undefined)
+const OnlineUserContext = createContext<number[]>([])
 
 export const ChatProvider: React.FC<{ children: React.ReactNode }> = ({
   children,
@@ -54,6 +55,7 @@ export const ChatProvider: React.FC<{ children: React.ReactNode }> = ({
     addOrUpdateMessageAtLast,
     removeMessage,
   } = useChatMessagesHelper(messages, setMessages)
+  const [onlineUsers, setOnlineUsers] = useState<number[]>([])
   const socketRef = useRef<Socket | null>(null)
   const [loadingChats, setLoadingChats] = useState(false)
   const [loadingMessages, setLoadingMessages] = useState(false)
@@ -191,6 +193,26 @@ export const ChatProvider: React.FC<{ children: React.ReactNode }> = ({
     // Listen for direct message events
     if (!socketRef.current) return
 
+    socketRef.current.on('socket-room-online-status', (res: any) => {
+      if (res.status === 'ok') {
+        const fetchOnlineUsers = async () => {
+          try {
+            const response = await fetch(
+              `${import.meta.env.VITE_API_URL}/api/users/online`,
+            )
+            if (!response.ok) {
+              throw new Error('Failed to fetch online users')
+            }
+            const data = await response.json()
+            setOnlineUsers(data)
+          } catch (error) {
+            console.error('Error fetching online users:', error)
+          }
+        }
+        fetchOnlineUsers()
+      }
+    })
+
     socketRef.current.on('socket-room-message', (res) => {
       console.log('Message received:', res)
       if (res.status === 'ok') {
@@ -400,7 +422,7 @@ export const ChatProvider: React.FC<{ children: React.ReactNode }> = ({
     updateChat({
       id: chatId,
       lastMessage: message.text,
-      lastSentAt: message.sentAt
+      lastSentAt: message.sentAt,
     })
   }
 
@@ -739,11 +761,18 @@ export const ChatProvider: React.FC<{ children: React.ReactNode }> = ({
         fetchMessageToChat,
       }}
     >
-      {children}
+      <OnlineUserContext.Provider value={onlineUsers}>
+        {children}
+      </OnlineUserContext.Provider>
     </ChatContext.Provider>
   )
 }
 
+export const useOnlineUsers = () => {
+  const context = useContext(OnlineUserContext)
+  return context
+}
+
 export const useChat = () => {
   const context = useContext(ChatContext)
   if (context === undefined) {
diff --git a/server/src/services/users/controller.ts b/server/src/services/users/controller.ts
index 4873673..a90e637 100644
--- a/server/src/services/users/controller.ts
+++ b/server/src/services/users/controller.ts
@@ -291,3 +291,26 @@ export const updateUserOffline = async (userId: number): Promise<void> => {
   });
 };
 
+export const getAllOnlineUsers = async (): Promise<UserDto[]> => {
+  const users = await prisma.user.findMany({
+    where: { isOnline: true },
+    select: {
+      id: true,
+      email: true,
+      username: true,
+      registeredAt: true,
+      lastLoginAt: true,
+      isOnline: true,
+    },
+  });
+
+  return users.map((user) => ({
+    id: user.id,
+    email: user.email,
+    username: user.username,
+    registeredAt: user.registeredAt,
+    lastLoginAt: user.lastLoginAt,
+    isOnline: user.isOnline,
+  }));
+};
+
diff --git a/server/src/services/users/route.ts b/server/src/services/users/route.ts
index 320b1bb..11d6e94 100644
--- a/server/src/services/users/route.ts
+++ b/server/src/services/users/route.ts
@@ -1,7 +1,7 @@
 import * as express from 'express';
 import { body, validationResult } from 'express-validator';
 
-import { registerUser, getUserById, getUserByUsername, loginUser, updateUsername, getChat, getAllUsers } from './controller';
+import { registerUser, getUserById, getUserByUsername, loginUser, updateUsername, getChat, getAllUsers, getAllOnlineUsers } from './controller';
 import { validateRegisterUser, protect } from '@/middleware/auth';
 import { getSignedJwtToken } from './utils';
 
@@ -12,6 +12,11 @@ router.get('/', async (req: express.Request, res: express.Response): Promise<voi
   res.status(200).json(users);
 });
 
+router.get('/online', async (req: express.Request, res: express.Response): Promise<void> => {
+  const onlineUsers = await getAllOnlineUsers();
+  res.status(200).json(onlineUsers);
+});
+
 /**
  * @swagger
  * /api/users:
@@ -374,4 +379,4 @@ router.put(
   }
 );
 
-export default router;
\ No newline at end of file
+export default router;