diff --git a/app/Filament/Resources/ApiKeyResource.php b/app/Filament/Resources/ApiKeyResource.php
index 5c74af48f..b4bea3352 100644
--- a/app/Filament/Resources/ApiKeyResource.php
+++ b/app/Filament/Resources/ApiKeyResource.php
@@ -12,12 +12,12 @@ class ApiKeyResource extends Resource
 {
     protected static ?string $model = ApiKey::class;
     protected static ?string $label = 'API Key';
+    protected static ?string $navigationIcon = 'tabler-key';
 
     public static function getNavigationBadge(): ?string
     {
-        return static::getModel()::count();
+        return static::getModel()::count() ?: null;
     }
-    protected static ?string $navigationIcon = 'tabler-key';
 
     public static function canEdit($record): bool
     {
diff --git a/app/Filament/Resources/DatabaseHostResource.php b/app/Filament/Resources/DatabaseHostResource.php
index 60d6c27b4..baf8e7937 100644
--- a/app/Filament/Resources/DatabaseHostResource.php
+++ b/app/Filament/Resources/DatabaseHostResource.php
@@ -10,15 +10,15 @@ class DatabaseHostResource extends Resource
 {
     protected static ?string $model = DatabaseHost::class;
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count();
-    }
-
     protected static ?string $label = 'Databases';
 
     protected static ?string $navigationIcon = 'tabler-database';
 
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
     public static function getRelations(): array
     {
         return [
diff --git a/app/Filament/Resources/DatabaseResource.php b/app/Filament/Resources/DatabaseResource.php
index 2ccaad9b9..cda7fb234 100644
--- a/app/Filament/Resources/DatabaseResource.php
+++ b/app/Filament/Resources/DatabaseResource.php
@@ -10,15 +10,15 @@ class DatabaseResource extends Resource
 {
     protected static ?string $model = Database::class;
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count();
-    }
-
     protected static ?string $navigationIcon = 'tabler-database';
 
     protected static bool $shouldRegisterNavigation = false;
 
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
     public static function getRelations(): array
     {
         return [
diff --git a/app/Filament/Resources/EggResource.php b/app/Filament/Resources/EggResource.php
index 5f8335917..3f332b633 100644
--- a/app/Filament/Resources/EggResource.php
+++ b/app/Filament/Resources/EggResource.php
@@ -10,16 +10,17 @@ class EggResource extends Resource
 {
     protected static ?string $model = Egg::class;
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count();
-    }
     protected static ?string $navigationIcon = 'tabler-eggs';
 
     protected static ?string $recordTitleAttribute = 'name';
 
     protected static ?string $recordRouteKeyName = 'id';
 
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
     public static function getRelations(): array
     {
         return [
diff --git a/app/Filament/Resources/MountResource.php b/app/Filament/Resources/MountResource.php
index e85b1e278..7763ed0c7 100644
--- a/app/Filament/Resources/MountResource.php
+++ b/app/Filament/Resources/MountResource.php
@@ -10,13 +10,13 @@ class MountResource extends Resource
 {
     protected static ?string $model = Mount::class;
 
+    protected static ?string $navigationIcon = 'tabler-layers-linked';
+
     public static function getNavigationBadge(): ?string
     {
-        return static::getModel()::count();
+        return static::getModel()::count() ?: null;
     }
 
-    protected static ?string $navigationIcon = 'tabler-layers-linked';
-
     public static function getRelations(): array
     {
         return [
diff --git a/app/Filament/Resources/NodeResource.php b/app/Filament/Resources/NodeResource.php
index cfb035c03..bff1e0a40 100644
--- a/app/Filament/Resources/NodeResource.php
+++ b/app/Filament/Resources/NodeResource.php
@@ -11,15 +11,15 @@ class NodeResource extends Resource
 {
     protected static ?string $model = Node::class;
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count();
-    }
-
     protected static ?string $navigationIcon = 'tabler-server-2';
 
     protected static ?string $recordTitleAttribute = 'name';
 
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
     public static function getRelations(): array
     {
         return [
diff --git a/app/Filament/Resources/ServerResource.php b/app/Filament/Resources/ServerResource.php
index 7307a49ec..f258355ac 100644
--- a/app/Filament/Resources/ServerResource.php
+++ b/app/Filament/Resources/ServerResource.php
@@ -10,15 +10,15 @@ class ServerResource extends Resource
 {
     protected static ?string $model = Server::class;
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count();
-    }
-
     protected static ?string $navigationIcon = 'tabler-brand-docker';
 
     protected static ?string $recordTitleAttribute = 'name';
 
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
     public static function getRelations(): array
     {
         return [
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index 8bb2df1f5..0327b4d7b 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -11,14 +11,15 @@ class UserResource extends Resource
 {
     protected static ?string $model = User::class;
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count();
-    }
     protected static ?string $navigationIcon = 'tabler-users';
 
     protected static ?string $recordTitleAttribute = 'username';
 
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
     public static function getRelations(): array
     {
         return [