diff --git a/resources/views/livewire/dishes/dishes-list.blade.php b/resources/views/livewire/dishes/dishes-list.blade.php
index 951197d..559a508 100644
--- a/resources/views/livewire/dishes/dishes-list.blade.php
+++ b/resources/views/livewire/dishes/dishes-list.blade.php
@@ -83,26 +83,32 @@ class="w-full p-2 border rounded bg-gray-600 border-secondary text-gray-100 focu
                         @error('name') <span class="text-danger text-xs">{{ $message }}</span> @enderror
                     </div>
 
-                    <div class="mb-6">
-                        <label class="block text-sm font-medium mb-2">Assign to Users</label>
-                        <div class="space-y-2 max-h-40 overflow-y-auto border border-secondary rounded p-3 bg-gray-700">
-                            @foreach($users as $user)
-                                <label class="flex items-center">
-                                    <input type="checkbox" 
-                                           wire:model="selectedUsers" 
-                                           value="{{ $user->id }}" 
-                                           class="rounded border-secondary bg-gray-600 text-primary focus:ring-accent-blue mr-2">
-                                    <div class="flex items-center">
-                                        <div class="w-6 h-6 bg-primary rounded-full flex items-center justify-center text-white text-xs font-bold mr-2">
-                                            {{ strtoupper(substr($user->name, 0, 1)) }}
+                    @if($users->count() > 0)
+                        <div class="mb-6">
+                            <label class="block text-sm font-medium mb-2">Assign to Users</label>
+                            <div class="space-y-2 max-h-40 overflow-y-auto border border-secondary rounded p-3 bg-gray-700">
+                                @foreach($users as $user)
+                                    <label class="flex items-center">
+                                        <input type="checkbox" 
+                                               wire:model="selectedUsers" 
+                                               value="{{ $user->id }}" 
+                                               class="rounded border-secondary bg-gray-600 text-primary focus:ring-accent-blue mr-2">
+                                        <div class="flex items-center">
+                                            <div class="w-6 h-6 bg-primary rounded-full flex items-center justify-center text-white text-xs font-bold mr-2">
+                                                {{ strtoupper(substr($user->name, 0, 1)) }}
+                                            </div>
+                                            {{ $user->name }}
                                         </div>
-                                        {{ $user->name }}
-                                    </div>
-                                </label>
-                            @endforeach
+                                    </label>
+                                @endforeach
+                            </div>
+                            @error('selectedUsers') <span class="text-danger text-xs">{{ $message }}</span> @enderror
                         </div>
-                        @error('selectedUsers') <span class="text-danger text-xs">{{ $message }}</span> @enderror
-                    </div>
+                    @else
+                        <div class="mb-6">
+                            <p class="text-gray-400 text-sm italic">No users available to assign. <a href="{{ route('users.index') }}" class="text-accent-blue hover:underline">Add users</a> to assign them to dishes.</p>
+                        </div>
+                    @endif
 
                     <div class="flex justify-end space-x-3">
                         <button type="button" 
@@ -135,26 +141,32 @@ class="w-full p-2 border rounded bg-gray-600 border-secondary text-gray-100 focu
                         @error('name') <span class="text-danger text-xs">{{ $message }}</span> @enderror
                     </div>
 
-                    <div class="mb-6">
-                        <label class="block text-sm font-medium mb-2">Assign to Users</label>
-                        <div class="space-y-2 max-h-40 overflow-y-auto border border-secondary rounded p-3 bg-gray-700">
-                            @foreach($users as $user)
-                                <label class="flex items-center">
-                                    <input type="checkbox" 
-                                           wire:model="selectedUsers" 
-                                           value="{{ $user->id }}" 
-                                           class="rounded border-secondary bg-gray-600 text-primary focus:ring-accent-blue mr-2">
-                                    <div class="flex items-center">
-                                        <div class="w-6 h-6 bg-primary rounded-full flex items-center justify-center text-white text-xs font-bold mr-2">
-                                            {{ strtoupper(substr($user->name, 0, 1)) }}
+                    @if($users->count() > 0)
+                        <div class="mb-6">
+                            <label class="block text-sm font-medium mb-2">Assign to Users</label>
+                            <div class="space-y-2 max-h-40 overflow-y-auto border border-secondary rounded p-3 bg-gray-700">
+                                @foreach($users as $user)
+                                    <label class="flex items-center">
+                                        <input type="checkbox" 
+                                               wire:model="selectedUsers" 
+                                               value="{{ $user->id }}" 
+                                               class="rounded border-secondary bg-gray-600 text-primary focus:ring-accent-blue mr-2">
+                                        <div class="flex items-center">
+                                            <div class="w-6 h-6 bg-primary rounded-full flex items-center justify-center text-white text-xs font-bold mr-2">
+                                                {{ strtoupper(substr($user->name, 0, 1)) }}
+                                            </div>
+                                            {{ $user->name }}
                                         </div>
-                                        {{ $user->name }}
-                                    </div>
-                                </label>
-                            @endforeach
+                                    </label>
+                                @endforeach
+                            </div>
+                            @error('selectedUsers') <span class="text-danger text-xs">{{ $message }}</span> @enderror
                         </div>
-                        @error('selectedUsers') <span class="text-danger text-xs">{{ $message }}</span> @enderror
-                    </div>
+                    @else
+                        <div class="mb-6">
+                            <p class="text-gray-400 text-sm italic">No users available to assign. <a href="{{ route('users.index') }}" class="text-accent-blue hover:underline">Add users</a> to assign them to dishes.</p>
+                        </div>
+                    @endif
 
                     <div class="flex justify-end space-x-3">
                         <button type="button" 
diff --git a/tests/Browser/CreateDishTest.php b/tests/Browser/CreateDishTest.php
index 850eb30..07b51be 100644
--- a/tests/Browser/CreateDishTest.php
+++ b/tests/Browser/CreateDishTest.php
@@ -50,7 +50,8 @@ public function testCanOpenCreateDishModal(): void
                     ->pause(1000)
                     ->assertSee('Add New Dish')
                     ->assertSee('Dish Name')
-                    ->assertSee('Assign to Users')
+                    ->assertSee('No users available to assign')
+                    ->assertSee('Add users')
                     ->assertSee('Create Dish')
                     ->assertSee('Cancel');
         });