diff --git a/backend-services/friend-service/src/Routes/FriendsRouter.ts b/backend-services/friend-service/src/Routes/FriendsRouter.ts
index cf4be6e6c80141f10fa5aebc497e1063b1677efd..85f20a8ab24042ee2fe5557f6b451fed8f3c6d6d 100644
--- a/backend-services/friend-service/src/Routes/FriendsRouter.ts
+++ b/backend-services/friend-service/src/Routes/FriendsRouter.ts
@@ -1,6 +1,6 @@
 import express, { Response } from 'express'
 import { FriendManager } from '../Friends/FriendManager'
-import { CustomJWTRequest } from '../Middleware/Auth'
+import { CustomJWTRequest, TokenData } from '../Middleware/Auth'
 
 export const FriendsRouter = express.Router()
 const friendManager = new FriendManager();
@@ -11,7 +11,9 @@ const friendManager = new FriendManager();
  */
 FriendsRouter.get('/', async (req:CustomJWTRequest, res:Response): Promise<void> => {
   const {token} = req
-  return friendManager.GetFriendIds(token as string).then(result => {
+  const uid = (token as TokenData).userId
+
+  return friendManager.GetFriendIds(uid).then(result => {
     res.status(200).json({result: result});
   }).catch((error: Error) => {
     res.status(400).json({error: error})