diff --git a/packages/database/prisma/json/User.ts b/packages/database/prisma/json/User.ts
index 0603e0f9..65378253 100644
--- a/packages/database/prisma/json/User.ts
+++ b/packages/database/prisma/json/User.ts
@@ -28,7 +28,7 @@ export const getPublicUser = (
 	return {
 		firstname: user.firstname,
 		lastname: user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName, // Only take the first letter of each section of the last name
-		fullName: `${user.firstname} ${lastName}`,
+		fullName: `${user.firstname} ${user.settingsHideLastname && !options.ignorePrivacy ? lastName : ""}`,
 		publicId: user.publicId,
 		badges: user.badges,
 	};