diff --git a/apps/web/pages/[user]/[type].tsx b/apps/web/pages/[user]/[type].tsx
index d6722a1916..e808d9e647 100644
--- a/apps/web/pages/[user]/[type].tsx
+++ b/apps/web/pages/[user]/[type].tsx
@@ -187,7 +187,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   return {
     props: {
       profile: {
-        name: user.name,
+        name: user.name || user.username,
         image: user.avatar,
         slug: user.username,
         theme: user.theme,
diff --git a/apps/web/pages/team/[slug]/[type].tsx b/apps/web/pages/team/[slug]/[type].tsx
index 1c0905227e..5546726855 100644
--- a/apps/web/pages/team/[slug]/[type].tsx
+++ b/apps/web/pages/team/[slug]/[type].tsx
@@ -100,7 +100,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   return {
     props: {
       profile: {
-        name: team.name,
+        name: team.name || team.slug,
         slug: team.slug,
         image: team.logo,
         theme: null,