diff --git a/app/Livewire/Studio/Master/Outlet/Create.php b/app/Livewire/Studio/Master/Outlet/Create.php
index 15d5f00..fc254cf 100644
--- a/app/Livewire/Studio/Master/Outlet/Create.php
+++ b/app/Livewire/Studio/Master/Outlet/Create.php
@@ -18,7 +18,7 @@ class Create extends Component
 
     public OutletForm $form;
 
-    /** @var array<int, Day> */
+    /** @var array<Day> */
     public array $days = [];
 
     public function mount(): void
diff --git a/app/Livewire/Studio/Master/Outlet/Edit.php b/app/Livewire/Studio/Master/Outlet/Edit.php
index da5a8a5..eeca53a 100644
--- a/app/Livewire/Studio/Master/Outlet/Edit.php
+++ b/app/Livewire/Studio/Master/Outlet/Edit.php
@@ -19,7 +19,7 @@ class Edit extends Component
 
     public OutletForm $form;
 
-    /** @var array<int, Day> */
+    /** @var array<Day> */
     public array $days = [];
 
     public function mount(Outlet $outlet): void
diff --git a/app/Livewire/Studio/Master/Outlet/Index.php b/app/Livewire/Studio/Master/Outlet/Index.php
index d0a61ff..1539bd9 100644
--- a/app/Livewire/Studio/Master/Outlet/Index.php
+++ b/app/Livewire/Studio/Master/Outlet/Index.php
@@ -43,6 +43,10 @@ protected function loadOutlets(): void
 
     protected function formatOpeningHours(Outlet $outlet): array
     {
+        if (! $outlet->openingHours || $outlet->openingHours->isEmpty()) {
+            return [];
+        }
+
         return $outlet->openingHours->mapWithKeys(fn ($hour) => [
             Str::ucfirst(Str::lower(Day::from($hour->day->value)->label())) => [
                 'open' => formatTime($hour->open_time),
diff --git a/app/Traits/Outlet/WithFacilityHandler.php b/app/Traits/Outlet/WithFacilityHandler.php
index 77f2d33..178624f 100644
--- a/app/Traits/Outlet/WithFacilityHandler.php
+++ b/app/Traits/Outlet/WithFacilityHandler.php
@@ -2,18 +2,14 @@
 
 namespace App\Traits\Outlet;
 
-use App\Livewire\Forms\Studio\Master\OutletForm;
-
 trait WithFacilityHandler
 {
-    public OutletForm $form;
-
-    public function addFacility()
+    public function addFacility(): void
     {
         $this->form->facilities[] = '';
     }
 
-    public function removeFacility(int $index)
+    public function removeFacility(int $index): void
     {
         unset($this->form->facilities[$index]);
         $this->form->facilities = array_values($this->form->facilities);