diff --git a/src/common/repositories/UsersRepository.ts b/src/common/repositories/UsersRepository.ts
index f59c2385..b7643e18 100644
--- a/src/common/repositories/UsersRepository.ts
+++ b/src/common/repositories/UsersRepository.ts
@@ -138,26 +138,16 @@ export default class UsersRepository extends BaseRepository {
 	/**
 	 * @description : Find one user
 	 */
-	public async findOneByUid(
-		uid: string,
-		query?: any,
-	): Promise<
-		Users & {
-			contact: Contacts;
-			office_membership: Offices & {
-				address: Addresses;
-			};
-		}
-	> {
+	public async findOneByUid(uid: string, query?: any): Promise<Users> {
 		const findOneArgs: Prisma.UsersFindUniqueArgs = {
 			where: {
 				uid: uid,
 			},
 		};
-		const userEntity = await this.model.findUnique({
-			...findOneArgs,
-			include: { contact: true, office_membership: { include: { address: true } } },
-		});
+		if (query) {
+			findOneArgs.include = query;
+		}
+		const userEntity = await this.model.findUnique(findOneArgs);
 
 		if (!userEntity) {
 			throw new Error("User not found");