diff --git a/web/components/profile/profile-header.tsx b/web/components/profile/profile-header.tsx
index 0407a5d4..1ac3344d 100644
--- a/web/components/profile/profile-header.tsx
+++ b/web/components/profile/profile-header.tsx
@@ -60,7 +60,7 @@ export default function ProfileHeader(props: {
                 ) : (
                   <span className="font-semibold">{user.name}</span>
                 )}
-                , {profile.age}
+                {profile.age ? `, ${profile.age}` : ''}
               </span>
             </Row>
             <ProfilePrimaryInfo profile={profile}/>
diff --git a/web/components/profile/profile-primary-info.tsx b/web/components/profile/profile-primary-info.tsx
index 8efdf336..f578a209 100644
--- a/web/components/profile/profile-primary-info.tsx
+++ b/web/components/profile/profile-primary-info.tsx
@@ -17,16 +17,16 @@ export default function ProfilePrimaryInfo(props: { profile: Profile }) {
       : profile.country
   return (
     <Row className="text-ink-700 gap-4 text-sm">
-      <IconWithInfo
+      {profile.city && <IconWithInfo
         text={`${profile.city ?? ''}, ${stateOrCountry ?? ''}`}
         icon={<IoLocationOutline className="h-4 w-4" />}
-      />
-      <IconWithInfo
+      />}
+      {profile.gender && <IconWithInfo
         text={capitalize(convertGender(profile.gender as Gender))}
         icon={
           <GenderIcon gender={profile.gender as Gender} className="h-4 w-4 " />
         }
-      />
+      />}
       {profile.height_in_inches != null && (
         <IconWithInfo
           text={formatProfileValue('height_in_inches', profile.height_in_inches)}