diff --git a/app/Models/User.php b/app/Models/User.php
index 9fd2be78bc3e..2b4210ca7174 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -190,9 +190,7 @@ class User extends Authenticatable implements MustVerifyEmail
         $truth = app()->make(TruthSource::class);
 
         if ($this->company){
-
             return $this->company;
-        
         }
         elseif($truth->getCompany()){
             return $truth->getCompany();
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 2206abe686fb..ee6c6775d724 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -19,6 +19,7 @@ use App\Utils\TruthSource;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Queue\Events\JobProcessing;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\RateLimiter;
@@ -61,17 +62,10 @@ class AppServiceProvider extends ServiceProvider
             ]);
         }
 
-        // Queue::before(function (JobProcessing $event) {
-        //     // \Log::info('Event Job '.$event->connectionName);
-        //     \Log::error('Event Job '.$event->job->getJobId);
-        //     // \Log::info('Event Job '.$event->job->payload());
-        // });
-        //! Update Posted AT
-        // Queue::after(function (JobProcessed $event) {
-        //     // \Log::info('Event Job '.$event->connectionName);
-        //     \Log::error('Event Job '.$event->job->getJobId);
-        //     // \Log::info('Event Job '.$event->job->payload());
-        // });
+        /* Ensure we don't have stale state in jobs */
+        Queue::before(function (JobProcessing $event) {
+            App::forgetInstance('truthsource');
+        });
  
         app()->instance(TruthSource::class, new TruthSource());
 
diff --git a/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php b/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
index 9797ed1f22a5..1c9c5010d8b5 100644
--- a/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
@@ -57,8 +57,7 @@
                             {{ $payment->translateDate($payment->date, $payment->client->date_format(), $payment->client->locale()) }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                            
-                            {{ $payment->translatedType(); }}
+                            {{ $payment->translatedType() }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
                             {!! \App\Utils\Number::formatMoney($payment->amount, $payment->client) !!}