diff --git a/app/repositories/user_repository.py b/app/repositories/user_repository.py
index 9e0048f..2d89941 100644
--- a/app/repositories/user_repository.py
+++ b/app/repositories/user_repository.py
@@ -11,18 +11,18 @@ class UserRepository:
     def get_all_users(self) -> list[UserEntity]:
         """Mengambil semua user dari database."""
         users = list(self.collection.find({}, {"_id": 0}))
-        return users if users else []
+        return [UserEntity(**user) for user in users]
 
     def get_user_by_email(self, email: str) -> Optional[UserEntity]:
         """Mendapatkan user berdasarkan email."""
         user = self.collection.find_one({"email": email}, {"_id": 0})
-        return user
+        return UserEntity(**user) if user else None
 
     def get_user_by_id(self, user_id: str) -> Optional[UserEntity]:
         """Mendapatkan user berdasarkan ID."""
         object_id = ObjectId(user_id)
         user = self.collection.find_one({"_id": object_id})
-        return user
+        return UserEntity(**user) if user else None
 
     def get_by_google_id(self, google_id: str) -> Optional[UserEntity]:
         user_data = self.collection.find_one({"google_id": google_id})