diff --git a/app/Http/Livewire/SubscriptionPlanSwitch.php b/app/Http/Livewire/SubscriptionPlanSwitch.php
index c1ea73efebfa..aac881662462 100644
--- a/app/Http/Livewire/SubscriptionPlanSwitch.php
+++ b/app/Http/Livewire/SubscriptionPlanSwitch.php
@@ -56,6 +56,7 @@ class SubscriptionPlanSwitch extends Component
      */
     public $total;
 
+    public $hide_button = false;
     /**
      * @var array
      */
@@ -139,12 +140,20 @@ class SubscriptionPlanSwitch extends Component
 
     public function handlePaymentNotRequired()
     {
-        return $this->target->service()->createChangePlanCredit([
+        $this->hide_button = true;
+
+        $response =  $this->target->service()->createChangePlanCredit([
             'recurring_invoice' => $this->recurring_invoice,
             'subscription' => $this->subscription,
             'target' => $this->target,
             'hash' => $this->hash,
         ]);
+
+        $this->hide_button = true;
+
+        $this->dispatchBrowserEvent('redirectRoute', ['route' => $response]);
+
+        // return redirect($response);
     }
 
     public function render()
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index 7f74fcb9be46..a79ccd9ab081 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -477,10 +477,14 @@ class SubscriptionService
 
             nlog($response);
 
-            if($credit)
-                return $this->handleRedirect('/client/credits/'.$credit->hashed_id);
-            else
-                return $this->handleRedirect('/client/credits');      
+            if($credit){
+                // return $this->handleRedirect('/client/credits/'.$credit->hashed_id);
+                return '/client/credits/'.$credit->hashed_id;
+            }
+            else{
+                // return $this->handleRedirect('/client/credits');      
+                return '/client/credits';
+            }
 
     }
 
diff --git a/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php b/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
index 7d53d6c5caf5..8d3c0301d58b 100644
--- a/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
@@ -1,3 +1,4 @@
+<div>
 <div class="grid grid-cols-12 gap-8 mt-8">
     <div class="col-span-12 md:col-span-5 md:col-start-4 px-4 py-5">
         <!-- Total price -->
@@ -62,6 +63,7 @@
             </div>
         </div>
         @elseif($amount <= 0)
+
             <div class="relative flex justify-center text-sm leading-5">
                 <h1 class="text-2xl font-bold tracking-wide bg-gray-100 px-6 py-0">
                     {{ ctrans('texts.total') }}: {{ \App\Utils\Number::formatMoney($amount, $subscription->company) }}
@@ -69,12 +71,20 @@
             </div>
             <div class="relative flex justify-center text-sm leading-5 mt-10">
 
-            <button wire:click="handlePaymentNotRequired" class="px-3 py-2 border rounded mr-4 hover:border-blue-600">
-                {{ ctrans('texts.click_to_continue') }}
+            <button wire:click="handlePaymentNotRequired" class="px-3 py-2 border rounded mr-4 hover:border-blue-600" wire:loading.attr="disabled" @if($hide_button) disabled @endif>
+                @if($hide_button) {{ ctrans('texts.loading') }} @else {{ ctrans('texts.click_to_continue') }} @endif
             </button>
-
             </div>
 
         @endif
     </div>
 </div>
+
+<script defer>
+window.addEventListener('redirectRoute', event => {
+
+    window.location.href = event.detail.route;
+
+})
+</script>
+</div>
\ No newline at end of file