diff --git a/apps/admin/src/components/VaultMenu.tsx b/apps/admin/src/components/VaultMenu.tsx
index d023a389..8b31e8eb 100644
--- a/apps/admin/src/components/VaultMenu.tsx
+++ b/apps/admin/src/components/VaultMenu.tsx
@@ -50,7 +50,10 @@ export const VaultMenu = ({ ragequittable, safeAddress }: VaultMenuProps) => {
   const theme = useTheme();
 
   const enableActions = useMemo(() => {
-    return connectedMember && Number(connectedMember.shares) > 0;
+    return (
+      connectedMember &&
+      (Number(connectedMember.sharesLootDelegateShares) > 0)
+    );
   }, [connectedMember]);
 
   const networkData = useMemo(() => {
diff --git a/apps/admin/src/components/VaultOverview.tsx b/apps/admin/src/components/VaultOverview.tsx
index 230f7445..ea03e6fc 100644
--- a/apps/admin/src/components/VaultOverview.tsx
+++ b/apps/admin/src/components/VaultOverview.tsx
@@ -109,13 +109,22 @@ export const VaultOverview = ({ dao, vault }: VaultOverviewProps) => {
       <DataGrid>
         <DataIndicator
           label="Balance"
-          data={formatValueTo({
-            value: vault.fiatTotal,
-            decimals: 2,
-            format: 'currencyShort',
-          })}
+          data={
+            vault?.fiatTotal
+              ? formatValueTo({
+                  value: vault.fiatTotal,
+                  decimals: 2,
+                  format: 'currencyShort',
+                })
+              : 'NA'
+          }
+        />
+        <DataIndicator
+          label="Tokens"
+          data={
+            vault?.tokenBalances?.length ? vault.tokenBalances.length : 'NA'
+          }
         />
-        <DataIndicator label="Tokens" data={vault.tokenBalances.length} />
       </DataGrid>
     </VaultOverviewCard>
   );