diff --git a/app/Livewire/MapperLeft.php b/app/Livewire/MapperLeft.php
index 5f255f66..183bd411 100644
--- a/app/Livewire/MapperLeft.php
+++ b/app/Livewire/MapperLeft.php
@@ -77,7 +77,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
                     ->tooltip('Click to filter by this group')
                     ->description(fn ($record): string => $record->country?->name ?? '')
                     ->action(function ($record) {
-                        if ($record?->competition_group_id && ! in_array($record->competition_group_id, $this->tableFilters['events']['competition_group_id'])) {
+                        if ($record?->competition_group_id ?? null && ! in_array($record->competition_group_id, $this->tableFilters['events']['competition_group_id'])) {
                             $this->tableFilters['events']['competition_group_id'][] = (string) $record->competition_group_id;
                             $this->dispatch('refreshMapperRight');
                         }
diff --git a/app/Livewire/MapperRight.php b/app/Livewire/MapperRight.php
index 1c312d85..55ce5f33 100644
--- a/app/Livewire/MapperRight.php
+++ b/app/Livewire/MapperRight.php
@@ -80,7 +80,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
                     ->tooltip('Click to filter by this group')
                     ->description(fn ($record): string => $record->country_betsapi?->name.' '.$record->country)
                     ->action(function ($record) {
-                        if ($record?->group_id && ! in_array($record->group_id, $this->tableFilters['events']['group_id'])) {
+                        if ($record?->group_id ?? null && ! in_array($record->group_id, $this->tableFilters['events']['group_id'])) {
                             $this->tableFilters['events']['group_id'][] = (string) $record->group_id;
                             $this->dispatch('refreshMapperRight');
                         }