diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index de4518e295a1..68b3078cdfb7 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -940,7 +940,7 @@ class SubscriptionService
                 'subscription' => $this->subscription->hashed_id,
                 'recurring_invoice' => $recurring_invoice_hashed_id,
                 'client' => $invoice->client->hashed_id,
-                'contact' => $invoice->client->primary_contact()->first()->hashed_id,
+                'contact' => $invoice->client->primary_contact()->first() ? $invoice->client->contacts->first() : false,
                 'invoice' => $invoice->hashed_id,
             ];
 
diff --git a/resources/views/portal/ninja2020/invoices/payment.blade.php b/resources/views/portal/ninja2020/invoices/payment.blade.php
index 4f2b8451855f..6596f978e32d 100644
--- a/resources/views/portal/ninja2020/invoices/payment.blade.php
+++ b/resources/views/portal/ninja2020/invoices/payment.blade.php
@@ -48,18 +48,28 @@
                             @endif
 
                             <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                                @if($invoice->po_number)
+                                <dt class="text-sm font-medium leading-5 text-gray-500">
+                                    {{ ctrans('texts.po_number') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ $invoice->po_number }}
+                                </dd>
+                                @elseif($invoice->public_notes)
+                                <dt class="text-sm font-medium leading-5 text-gray-500">
+                                    {{ ctrans('texts.public_notes') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ $invoice->public_notes }}
+                                </dd>
+                                @else
                                 <dt class="text-sm font-medium leading-5 text-gray-500">
                                     {{ ctrans('texts.invoice_date') }}
                                 </dt>
                                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                    @if($invoice->po_number)
-                                        {{ $invoice->po_number }}
-                                    @elseif($invoice->public_notes)
-                                        {{ $invoice->public_notes }}
-                                    @else
-                                        {{ $invoice->date}}
-                                    @endif
+                                    {{ $invoice->date }}
                                 </dd>
+                                @endif
                             </div>
 
                             @if(!empty($invoice->due_date) && !is_null($invoice->due_date))