diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index ba38d91222f9..6409f2bb7650 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -289,11 +289,11 @@
                 <div class="col-lg-8 col-sm-8 col-sm-offset-4 smaller" style="padding-top: 10px;">
                 	@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 && $invoice->is_public)
+    				@elseif ($invoice->id)
                         @if (isset($lastSent) && $lastSent)
                             {!! trans('texts.last_sent_on', ['date' => link_to('/invoices/'.$lastSent->public_id, $invoice->last_sent_date, ['id' => 'lastSent'])]) !!} <p/>
                         @endif
-                        @if ($invoice->is_recurring && $invoice->start_date)
+                        @if ($invoice->is_recurring && $invoice->start_date && $invoice->is_public)
                            {!! trans('texts.next_send_on', ['date' => '<span data-bind="tooltip: {title: \''.$invoice->getPrettySchedule().'\', html: true}">'.$account->formatDate($invoice->getNextSendDate() ?: $invoice->start_date).
                                 '<span class="glyphicon glyphicon-info-sign" style="padding-left:10px;color:#B1B5BA"></span></span>']) !!}
                             @if ($invoice->getDueDate())