diff --git a/app/Models/Consultation.php b/app/Models/Consultation.php
index 143d7a4..294a9d7 100644
--- a/app/Models/Consultation.php
+++ b/app/Models/Consultation.php
@@ -116,7 +116,7 @@ class Consultation extends Model
      */
     public function markAsCompleted(): void
     {
-        if ($this->status !== ConsultationStatus::Approved) {
+        if (! in_array($this->status, [ConsultationStatus::Approved, ConsultationStatus::NoShow])) {
             throw new \InvalidArgumentException(
                 __('messages.invalid_status_transition', ['from' => $this->status->value, 'to' => 'completed'])
             );
@@ -131,7 +131,7 @@ class Consultation extends Model
      */
     public function markAsNoShow(): void
     {
-        if ($this->status !== ConsultationStatus::Approved) {
+        if (! in_array($this->status, [ConsultationStatus::Approved, ConsultationStatus::Completed])) {
             throw new \InvalidArgumentException(
                 __('messages.invalid_status_transition', ['from' => $this->status->value, 'to' => 'no_show'])
             );
diff --git a/resources/views/livewire/admin/consultations/index.blade.php b/resources/views/livewire/admin/consultations/index.blade.php
index 6d0ffb6..0f1f2f3 100644
--- a/resources/views/livewire/admin/consultations/index.blade.php
+++ b/resources/views/livewire/admin/consultations/index.blade.php
@@ -384,37 +384,43 @@ new class extends Component
                             {{ __('common.edit') }}
                         </flux:button>
 
-                        @if($consultation->status === \App\Enums\ConsultationStatus::Approved)
+                        @if(in_array($consultation->status, [\App\Enums\ConsultationStatus::Approved, \App\Enums\ConsultationStatus::Completed, \App\Enums\ConsultationStatus::NoShow]))
                             <flux:dropdown>
                                 <flux:button variant="outline" size="sm" icon="ellipsis-vertical" />
 
                                 <flux:menu>
-                                    <flux:menu.item
-                                        wire:click="markCompleted({{ $consultation->id }})"
-                                        wire:confirm="{{ __('admin.confirm_mark_completed') }}"
-                                        icon="check-circle"
-                                    >
-                                        {{ __('admin.mark_completed') }}
-                                    </flux:menu.item>
+                                    @if($consultation->status !== \App\Enums\ConsultationStatus::Completed)
+                                        <flux:menu.item
+                                            wire:click="markCompleted({{ $consultation->id }})"
+                                            wire:confirm="{{ __('admin.confirm_mark_completed') }}"
+                                            icon="check-circle"
+                                        >
+                                            {{ __('admin.mark_completed') }}
+                                        </flux:menu.item>
+                                    @endif
 
-                                    <flux:menu.item
-                                        wire:click="markNoShow({{ $consultation->id }})"
-                                        wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
-                                        icon="x-circle"
-                                    >
-                                        {{ __('admin.mark_no_show') }}
-                                    </flux:menu.item>
+                                    @if($consultation->status !== \App\Enums\ConsultationStatus::NoShow)
+                                        <flux:menu.item
+                                            wire:click="markNoShow({{ $consultation->id }})"
+                                            wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
+                                            icon="x-circle"
+                                        >
+                                            {{ __('admin.mark_no_show') }}
+                                        </flux:menu.item>
+                                    @endif
 
-                                    <flux:menu.separator />
+                                    @if($consultation->status === \App\Enums\ConsultationStatus::Approved)
+                                        <flux:menu.separator />
 
-                                    <flux:menu.item
-                                        wire:click="cancel({{ $consultation->id }})"
-                                        wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
-                                        icon="trash"
-                                        variant="danger"
-                                    >
-                                        {{ __('admin.cancel_consultation') }}
-                                    </flux:menu.item>
+                                        <flux:menu.item
+                                            wire:click="cancel({{ $consultation->id }})"
+                                            wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
+                                            icon="trash"
+                                            variant="danger"
+                                        >
+                                            {{ __('admin.cancel_consultation') }}
+                                        </flux:menu.item>
+                                    @endif
                                 </flux:menu>
                             </flux:dropdown>
                         @endif
diff --git a/resources/views/livewire/admin/consultations/show.blade.php b/resources/views/livewire/admin/consultations/show.blade.php
index 06e1d3b..04f6604 100644
--- a/resources/views/livewire/admin/consultations/show.blade.php
+++ b/resources/views/livewire/admin/consultations/show.blade.php
@@ -574,40 +574,46 @@ new class extends Component
             </div>
 
             <!-- Status Actions -->
-            @if($consultation->status === \App\Enums\ConsultationStatus::Approved)
+            @if(in_array($consultation->status, [\App\Enums\ConsultationStatus::Approved, \App\Enums\ConsultationStatus::Completed, \App\Enums\ConsultationStatus::NoShow]))
                 <div class="bg-white rounded-lg p-6 border border-zinc-200">
                     <flux:heading size="lg" class="mb-4">{{ __('common.actions') }}</flux:heading>
 
                     <div class="space-y-2">
-                        <flux:button
-                            wire:click="markCompleted"
-                            wire:confirm="{{ __('admin.confirm_mark_completed') }}"
-                            variant="outline"
-                            class="w-full"
-                            icon="check-circle"
-                        >
-                            {{ __('admin.mark_completed') }}
-                        </flux:button>
+                        @if($consultation->status !== \App\Enums\ConsultationStatus::Completed)
+                            <flux:button
+                                wire:click="markCompleted"
+                                wire:confirm="{{ __('admin.confirm_mark_completed') }}"
+                                variant="outline"
+                                class="w-full"
+                                icon="check-circle"
+                            >
+                                {{ __('admin.mark_completed') }}
+                            </flux:button>
+                        @endif
 
-                        <flux:button
-                            wire:click="markNoShow"
-                            wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
-                            variant="outline"
-                            class="w-full"
-                            icon="x-circle"
-                        >
-                            {{ __('admin.mark_no_show') }}
-                        </flux:button>
+                        @if($consultation->status !== \App\Enums\ConsultationStatus::NoShow)
+                            <flux:button
+                                wire:click="markNoShow"
+                                wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
+                                variant="outline"
+                                class="w-full"
+                                icon="x-circle"
+                            >
+                                {{ __('admin.mark_no_show') }}
+                            </flux:button>
+                        @endif
 
-                        <flux:button
-                            wire:click="cancel"
-                            wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
-                            variant="danger"
-                            class="w-full"
-                            icon="trash"
-                        >
-                            {{ __('admin.cancel_consultation') }}
-                        </flux:button>
+                        @if($consultation->status === \App\Enums\ConsultationStatus::Approved)
+                            <flux:button
+                                wire:click="cancel"
+                                wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
+                                variant="danger"
+                                class="w-full"
+                                icon="trash"
+                            >
+                                {{ __('admin.cancel_consultation') }}
+                            </flux:button>
+                        @endif
                     </div>
                 </div>
             @endif
diff --git a/tests/Feature/Admin/ConsultationManagementTest.php b/tests/Feature/Admin/ConsultationManagementTest.php
index 92d7893..d669f97 100644
--- a/tests/Feature/Admin/ConsultationManagementTest.php
+++ b/tests/Feature/Admin/ConsultationManagementTest.php
@@ -189,14 +189,28 @@ test('admin can mark consultation as no-show', function () {
     expect($consultation->fresh()->status)->toBe(ConsultationStatus::NoShow);
 });
 
-test('cannot mark completed consultation as no-show', function () {
+test('admin can change completed consultation to no-show', function () {
     $admin = User::factory()->admin()->create();
     $consultation = Consultation::factory()->completed()->create();
 
     $this->actingAs($admin);
 
     Volt::test('admin.consultations.index')
-        ->call('markNoShow', $consultation->id);
+        ->call('markNoShow', $consultation->id)
+        ->assertHasNoErrors();
+
+    expect($consultation->fresh()->status)->toBe(ConsultationStatus::NoShow);
+});
+
+test('admin can change no-show consultation to completed', function () {
+    $admin = User::factory()->admin()->create();
+    $consultation = Consultation::factory()->noShow()->create();
+
+    $this->actingAs($admin);
+
+    Volt::test('admin.consultations.index')
+        ->call('markCompleted', $consultation->id)
+        ->assertHasNoErrors();
 
     expect($consultation->fresh()->status)->toBe(ConsultationStatus::Completed);
 });