diff --git a/apps/shelve/app/pages/environments.vue b/apps/shelve/app/pages/environments.vue
index 6d7026ba..fbebb671 100644
--- a/apps/shelve/app/pages/environments.vue
+++ b/apps/shelve/app/pages/environments.vue
@@ -3,7 +3,7 @@ import { type Environment, TeamRole } from '@shelve/types'
 import { ConfirmModal } from '#components'
 import { hasAccess } from '~/utils/hasAccess'
 
-const teamEnv = useTeamEnv()
+const teamEnv = ref<Environment[]>([])
 const teamId = useTeamId()
 const teamRole = useTeamRole()
 
@@ -13,6 +13,7 @@ const {
 
 const newEnv = ref('')
 const loading = ref(false)
+const ceateLoading = ref(false)
 const updateLoading = ref(false)
 
 const columns = [
@@ -20,14 +21,29 @@ const columns = [
     accessorKey: 'name',
     header: 'Name',
   },
+  {
+    accessorKey: 'variablesCount',
+    header: 'Variable Count',
+  },
   {
     accessorKey: 'actions',
     header: 'Actions',
   }
 ]
 
-async function create() {
+async function fetchEnvironments() {
   loading.value = true
+  try {
+    teamEnv.value = await $fetch<Environment[]>(`/api/environments?teamId=${ teamId.value }`)
+  } catch (error) {
+    console.error(error)
+  }
+  loading.value = false
+}
+fetchEnvironments()
+
+async function create() {
+  ceateLoading.value = true
   try {
     if (!newEnv.value) {
       toast.error('Environment name is required')
@@ -43,12 +59,12 @@ async function create() {
         name: newEnv.value
       },
     })
-    await fetchTeams()
+    await fetchEnvironments()
     newEnv.value = ''
   } catch (error) {
     console.error(error)
   }
-  loading.value = false
+  ceateLoading.value = false
 }
 
 async function updateEnv(env: Environment) {
@@ -59,7 +75,7 @@ async function updateEnv(env: Environment) {
       name: env.name
     },
   })
-  await fetchTeams()
+  await fetchEnvironments()
   updateLoading.value = false
 }
 
@@ -67,7 +83,7 @@ async function deleteEnv(environments: Environment) {
   await $fetch(`/api/teams/${teamId.value}/environments/${environments.id}`, {
     method: 'DELETE',
   })
-  await fetchTeams()
+  await fetchEnvironments()
 }
 
 const modal = useModal()
@@ -121,14 +137,17 @@ function updateEnvironment(env: Environment) {
         </div>
         <form class="flex items-center gap-2" @submit.prevent="createEnvironment">
           <UInput v-model="newEnv" placeholder="New environment name" required />
-          <UButton label="Create" color="primary" :loading size="sm" type="submit" />
+          <UButton label="Create" color="primary" :loading="ceateLoading" size="sm" type="submit" />
         </form>
       </div>
       <div style="--stagger: 2" data-animate class="mt-6">
-        <UTable :data="teamEnv" :columns>
+        <UTable :data="teamEnv" :columns :loading>
           <template #name-cell="{ row }">
             {{ capitalize(row.original.name) }}
           </template>
+          <template #variableCount-cell="{ row }">
+            {{ row.original.variablesCount }}
+          </template>
           <template #actions-cell="{ row }">
             <div class="flex gap-2">
               <UPopover arrow>
diff --git a/apps/shelve/server/services/environments.ts b/apps/shelve/server/services/environments.ts
index 8008ab79..dc2d1fd8 100644
--- a/apps/shelve/server/services/environments.ts
+++ b/apps/shelve/server/services/environments.ts
@@ -17,7 +17,12 @@ export class EnvironmentsService {
   async getEnvironments(teamId: number): Promise<Environment[]> {
     return await useDrizzle().query.environments.findMany({
       where: eq(tables.environments.teamId, teamId),
-      orderBy: [asc(tables.environments.name)]
+      orderBy: [asc(tables.environments.name)],
+      extras: {
+        variablesCount: useDrizzle()
+          .$count(tables.variableValues, eq(tables.variableValues.environmentId, tables.environments.id))
+          .as('variablesCount'),
+      },
     })
   }
 
diff --git a/packages/types/src/Environment.ts b/packages/types/src/Environment.ts
index a02dfe85..75a2ce90 100644
--- a/packages/types/src/Environment.ts
+++ b/packages/types/src/Environment.ts
@@ -8,6 +8,7 @@ export type Environment = {
   id: number
   name: string
   teamId: number
+  variablesCount?: number
   createdAt: Date
   updatedAt: Date
 }