diff --git a/app/Console/Commands/OpenBooks/SyncOpenBooks.php b/app/Console/Commands/OpenBooks/SyncOpenBooks.php
index 9fbb8835..0ab583a6 100644
--- a/app/Console/Commands/OpenBooks/SyncOpenBooks.php
+++ b/app/Console/Commands/OpenBooks/SyncOpenBooks.php
@@ -32,7 +32,7 @@ class SyncOpenBooks extends Command
         try {
 
             foreach ($response->json()['cases'] as $case) {
-                BookCase::withoutGlobalScopes()->updateOrCreate(
+                BookCase::updateOrCreate(
                     [
                         'id' => $case['id'],
                     ],
diff --git a/app/Http/Livewire/BookCase/BookCaseTable.php b/app/Http/Livewire/BookCase/BookCaseTable.php
index 20522067..98d049a0 100644
--- a/app/Http/Livewire/BookCase/BookCaseTable.php
+++ b/app/Http/Livewire/BookCase/BookCaseTable.php
@@ -31,7 +31,7 @@ class BookCaseTable extends Component
                               'icon_size' => [42, 42],
                           ])
                           ->toArray(),
-            'bookCases' => BookCase::get(),
+            'bookCases' => BookCase::query()->active()->get(),
             'countries' => Country::query()
                                   ->select(['code', 'name'])
                                   ->get(),
diff --git a/app/Http/Livewire/BookCase/Heatmap.php b/app/Http/Livewire/BookCase/Heatmap.php
index d98fcc50..0bfeec16 100644
--- a/app/Http/Livewire/BookCase/Heatmap.php
+++ b/app/Http/Livewire/BookCase/Heatmap.php
@@ -13,11 +13,13 @@ class Heatmap extends Component
     public function render()
     {
         $data = BookCase::query()
+                        ->active()
                         ->whereHas('orangePills')
-                        ->get()->map(fn($bookCase) => [
-            'lat' => $bookCase->latitude,
-            'lng' => $bookCase->longitude,
-        ]);
+                        ->get()
+                        ->map(fn($bookCase) => [
+                            'lat' => $bookCase->latitude,
+                            'lng' => $bookCase->longitude,
+                        ]);
 
         return view('livewire.book-case.heatmap', [
             'heatmap_data' => $data->toArray(),
diff --git a/app/Http/Livewire/BookCase/WorldMap.php b/app/Http/Livewire/BookCase/WorldMap.php
index d85f16c0..262ad04c 100644
--- a/app/Http/Livewire/BookCase/WorldMap.php
+++ b/app/Http/Livewire/BookCase/WorldMap.php
@@ -17,6 +17,7 @@ class WorldMap extends Component
             'mapData' => BookCase::query()
                                  ->select(['id', 'latitude', 'longitude'])
                                  ->withCount('orangePills')
+                                 ->active()
                                  ->get()
                                  ->map(fn($bookCase) => [
                                      'lat' => $bookCase->latitude,
diff --git a/app/Http/Livewire/Tables/BookCaseTable.php b/app/Http/Livewire/Tables/BookCaseTable.php
index e41defd0..627ad6f3 100644
--- a/app/Http/Livewire/Tables/BookCaseTable.php
+++ b/app/Http/Livewire/Tables/BookCaseTable.php
@@ -123,6 +123,7 @@ class BookCaseTable extends DataTableComponent
     public function builder(): Builder
     {
         return BookCase::query()
+                       ->active()
                        ->with([
                            'orangePills',
                        ])
diff --git a/app/Http/Livewire/Tables/CityTable.php b/app/Http/Livewire/Tables/CityTable.php
index ca870c38..5b474362 100644
--- a/app/Http/Livewire/Tables/CityTable.php
+++ b/app/Http/Livewire/Tables/CityTable.php
@@ -113,7 +113,7 @@ class CityTable extends DataTableComponent
     {
         $city = City::query()
                     ->find($id);
-        $query = BookCase::radius($city->latitude, $city->longitude, 25);
+        $query = BookCase::active()->radius($city->latitude, $city->longitude, 25);
         $ids = $query->pluck('id');
         if ($ids->isEmpty()) {
             $this->notification()
diff --git a/app/Models/BookCase.php b/app/Models/BookCase.php
index 43cfc264..3a197cc3 100644
--- a/app/Models/BookCase.php
+++ b/app/Models/BookCase.php
@@ -41,7 +41,6 @@ class BookCase extends Model implements HasMedia
 
     protected static function booted()
     {
-        static::addGlobalScope(new ActiveBookCases);
         static::creating(function ($model) {
             if (!$model->created_by) {
                 $model->created_by = auth()->id();
@@ -49,6 +48,11 @@ class BookCase extends Model implements HasMedia
         });
     }
 
+    public function scopeActive($query)
+    {
+        return $query->where('deactivated', false);
+    }
+
     public function registerMediaConversions(Media $media = null): void
     {
         $this