diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 50e37bb88b1e..aadc48d183d8 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -580,14 +580,7 @@
 	</div>
 	<p>&nbsp;</p>
 
-	@if (Auth::user()->account->live_preview)
-		@include('invoices.pdf', ['account' => Auth::user()->account])
-	@else
-		<script type="text/javascript">
-			var invoiceLabels = {!! json_encode($account->getInvoiceLabels()) !!};
-			function refreshPDF() {}
-		</script>
-	@endif
+	@include('invoices.pdf', ['account' => Auth::user()->account, 'hide_pdf' => ! Auth::user()->account->live_preview])
 
 	@if (!Auth::user()->account->isPro())
 		<div style="font-size:larger">
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index 521975ecc39d..fdbb67ab0dbf 100644
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -1,7 +1,9 @@
+@if (empty($hide_pdf))
 <iframe id="theFrame" style="display:block" frameborder="1" width="100%" height="{{ isset($pdfHeight) ? $pdfHeight : 1180 }}px"></iframe>
 <div id="theCanvasDiv" style="display:none;width:100%;background-color:#525659;border:solid 2px #9a9a9a;padding-top:40px;text-align:center">
     <canvas id="theCanvas" style="max-width:100%;border:solid 1px #CCCCCC;"></canvas>
 </div>
+@endif
 
 @if (!Utils::isNinja() || !Utils::isPro())
 <div class="modal fade" id="moreDesignsModal" tabindex="-1" role="dialog" aria-labelledby="moreDesignsModalLabel" aria-hidden="true">
@@ -112,12 +114,14 @@
   var needsRefresh = false;
 
   function refreshPDF(force) {
-    //console.log('refresh PDF - force: ' + force + ' ' + (new Date()).getTime())
     return getPDFString(refreshPDFCB, force);
   }
 
   function refreshPDFCB(string) {
     if (!string) return;
+    @if ( !empty($hide_pdf))
+        return;
+    @endif
     PDFJS.workerSrc = '{{ asset('js/pdf_viewer.worker.js') }}';
     var forceJS = {{ Auth::check() && Auth::user()->force_pdfjs ? 'true' : 'false' }};
     // Use the browser's built in PDF viewer