diff --git a/app/Traits/PlayerProps/PlayerQuery.php b/app/Traits/PlayerProps/PlayerQuery.php
index 8d083c10..d512de90 100644
--- a/app/Traits/PlayerProps/PlayerQuery.php
+++ b/app/Traits/PlayerProps/PlayerQuery.php
@@ -180,21 +180,22 @@ trait PlayerQuery
     {
         switch ($this->season_or_date) {
             case 'season':
-                if (! $this->season_selected) {
-                    $this->season_selected = $this->getCurrentSeason();
-                }
+
                 if ($this->season_mode == 'fullyear') {
                     // Keeps elements where '/' is FALSE
                     $this->season_selected = array_filter($this->season_selected, fn ($item) => ! str_contains($item, '/'));
+                    if (! $this->season_selected) {
+                        $this->season_selected = $this->getCurrentSeason();
+                    }
                     $this->season_selected = array_map('intval', $this->season_selected);
                 } else {
                     // Keeps elements ONLY if '/' returns TRUE
                     $this->season_selected = array_filter($this->season_selected, fn ($item) => str_contains($item, '/'));
+                    if (! $this->season_selected) {
+                        $this->season_selected = $this->getCurrentSeason();
+                    }
                     $this->season_selected = array_map('strval', $this->season_selected);
                 }
-                if (! $this->season_selected) {
-                    $this->season_selected = $this->getCurrentSeason();
-                }
 
                 Log::debug('season_selected', [$this->season_mode, $this->season_selected]);