diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 01cb6f4dd434..ba38d91222f9 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -287,9 +287,9 @@
             @if ($entityType == ENTITY_INVOICE)
             <div class="form-group" style="margin-bottom: 8px">
                 <div class="col-lg-8 col-sm-8 col-sm-offset-4 smaller" style="padding-top: 10px;">
-                	@if ($invoice->recurring_invoice)
+                	@if ($invoice->recurring_invoice_id && $invoice->recurring_invoice)
                         {!! trans('texts.created_by_invoice', ['invoice' => link_to('/invoices/'.$invoice->recurring_invoice->public_id, trans('texts.recurring_invoice'))]) !!} <p/>
-    				@elseif ($invoice->id)
+    				@elseif ($invoice->id && $invoice->is_public)
                         @if (isset($lastSent) && $lastSent)
                             {!! trans('texts.last_sent_on', ['date' => link_to('/invoices/'.$lastSent->public_id, $invoice->last_sent_date, ['id' => 'lastSent'])]) !!} <p/>
                         @endif