diff --git a/src/routes/applications/_Application.svelte b/src/routes/applications/_Application.svelte
index fb6a157c7..8f183eb13 100644
--- a/src/routes/applications/_Application.svelte
+++ b/src/routes/applications/_Application.svelte
@@ -15,6 +15,7 @@
 	import Docker from '$lib/components/svg/applications/Docker.svelte';
 	import Astro from '$lib/components/svg/applications/Astro.svelte';
 	import Eleventy from '$lib/components/svg/applications/Eleventy.svelte';
+	import { session } from '$app/stores';
 
 	const buildPack = application?.buildPack?.toLowerCase();
 </script>
@@ -54,7 +55,9 @@
 		{/if}
 
 		<div class="truncate text-center text-xl font-bold">{application.name}</div>
-		<div class="truncate text-center">Team {application.teams[0].name}</div>
+		{#if $session.teamId === '0'}
+			<div class="truncate text-center">Team {application.teams[0].name}</div>
+		{/if}
 		{#if application.fqdn}
 			<div class="truncate text-center">{application.fqdn}</div>
 		{/if}
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 6caa4d90e..32156ef4b 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -8,6 +8,7 @@
 	import Redis from '$lib/components/svg/databases/Redis.svelte';
 	import { post } from '$lib/api';
 	import { goto } from '$app/navigation';
+	import { session } from '$app/stores';
 
 	async function newDatabase() {
 		const { id } = await post('/databases/new', {});
@@ -59,7 +60,9 @@
 					<div class="font-bold text-xl text-center truncate">
 						{database.name}
 					</div>
-					<div class="text-center truncate">Team {database.teams[0].name}</div>
+					{#if $session.teamId === '0'}
+						<div class="text-center truncate">Team {database.teams[0].name}</div>
+					{/if}
 					{#if !database.type}
 						<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 							Configuration missing
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index a7b6b9a7e..df186e35f 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -57,7 +57,9 @@
 				<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 					<div class="box-selection hover:bg-sky-600">
 						<div class="font-bold text-xl text-center truncate">{destination.name}</div>
-						<div class="text-center truncate">Team {destination.teams[0].name}</div>
+						{#if $session.teamId === '0'}
+							<div class="text-center truncate">Team {destination.teams[0].name}</div>
+						{/if}
 						<div class="text-center truncate">{destination.network}</div>
 					</div>
 				</a>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index f2a6e5fb0..d590761a2 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -12,6 +12,7 @@
 	import UptimeKuma from '$lib/components/svg/services/UptimeKuma.svelte';
 	import Ghost from '$lib/components/svg/services/Ghost.svelte';
 	import MeiliSearch from '$lib/components/svg/services/MeiliSearch.svelte';
+	import { session } from '$app/stores';
 
 	export let services;
 	async function newService() {
@@ -74,7 +75,9 @@
 					<div class="font-bold text-xl text-center truncate">
 						{service.name}
 					</div>
-					<div class="text-center truncate">Team {service.teams[0].name}</div>
+					{#if $session.teamId === '0'}
+						<div class="text-center truncate">Team {service.teams[0].name}</div>
+					{/if}
 					{#if !service.type || !service.fqdn}
 						<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 							Configuration missing
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index d80579272..c57efdaa6 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -60,7 +60,9 @@
 						class:border-l-4={source.gitlabApp && !source.gitlabAppId}
 					>
 						<div class="font-bold text-xl text-center truncate">{source.name}</div>
-						<div class="text-center truncate">Team {source.teams[0].name}</div>
+						{#if $session.teamId === '0'}
+							<div class="text-center truncate">Team {source.teams[0].name}</div>
+						{/if}
 						{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
 							<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 								Configuration missing