diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php
index ae0a622..882e76c 100644
--- a/resources/views/components/layouts/app/sidebar.blade.php
+++ b/resources/views/components/layouts/app/sidebar.blade.php
@@ -93,13 +93,13 @@
                 <flux:navlist.item icon="building-office-2" :href="route_with_country('cities.index')"
                                    :current="request()->routeIs('cities.index')"
                                    wire:navigate
-                                   badge="{{ \App\Models\City::query()->count() }}">
+                                   badge="{{ \App\Models\City::query()->whereHas('country', fn($query) => $query->where('countries.code', request()->route('country')))->count() }}">
                     {{ __('Städte/Gebiete') }}
                 </flux:navlist.item>
                 <flux:navlist.item icon="map-pin" :href="route_with_country('venues.index')"
                                    :current="request()->routeIs('venues.index')"
                                    wire:navigate
-                                   badge="{{ \App\Models\Venue::query()->count() }}">
+                                   badge="{{ \App\Models\Venue::query()->whereHas('city.country', fn($query) => $query->where('countries.code', request()->route('country')))->count() }}">
                     {{ __('Veranstaltungsorte') }}
                 </flux:navlist.item>
             </flux:navlist.group>
diff --git a/resources/views/livewire/cities/index.blade.php b/resources/views/livewire/cities/index.blade.php
index c4de172..5d7e283 100644
--- a/resources/views/livewire/cities/index.blade.php
+++ b/resources/views/livewire/cities/index.blade.php
@@ -23,10 +23,12 @@ class extends Component {
     public function with(): array
     {
         return [
-            'cities' => City::with(['country', 'createdBy'])
+            'cities' => City::query()
+                ->with(['country', 'createdBy'])
                 ->when($this->search, fn($query)
                     => $query->where('name', 'ilike', '%'.$this->search.'%'),
                 )
+                ->whereHas('country', fn($query) => $query->where('countries.code', $this->country))
                 ->orderBy('name')
                 ->paginate(15),
         ];
diff --git a/resources/views/livewire/courses/index.blade.php b/resources/views/livewire/courses/index.blade.php
index 8818023..a0bb0eb 100644
--- a/resources/views/livewire/courses/index.blade.php
+++ b/resources/views/livewire/courses/index.blade.php
@@ -32,7 +32,7 @@ class extends Component {
                     ->where('name', 'ilike', '%'.$this->search.'%')
                     ->orWhere('description', 'ilike', '%'.$this->search.'%'),
                 )
-                ->whereHas('courseEvents.venue.city.country', fn($query) => $query->where('countries.code', request()->route('country')))
+                ->whereHas('courseEvents.venue.city.country', fn($query) => $query->where('countries.code', $this->country))
                 ->orderByDesc('has_future_events')
                 ->paginate(15),
         ];