diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php
index d6984104ccc2..e36ee602abcc 100644
--- a/resources/views/accounts/invoice_design.blade.php
+++ b/resources/views/accounts/invoice_design.blade.php
@@ -26,7 +26,7 @@
       }
     }
 
-    function getPDFString() {
+    function getPDFString(cb) {
       invoice.is_pro = {!! Auth::user()->isPro() ? 'true' : 'false' !!};
       invoice.account.hide_quantity = $('#hide_quantity').is(":checked");
       invoice.account.hide_paid_to_date = $('#hide_paid_to_date').is(":checked");
@@ -35,11 +35,7 @@
       NINJA.primaryColor = $('#primary_color').val();
       NINJA.secondaryColor = $('#secondary_color').val();
 
-      var doc = generatePDF(invoice, getDesignJavascript(), true);
-      if (!doc) {
-        return;
-      }
-      return doc.output('datauristring');
+      generatePDF(invoice, getDesignJavascript(), true, cb);
     }
 
     $(function() {   
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 27bf78c664eb..8e167af4c20d 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -692,7 +692,7 @@
 		var invoice = createInvoiceModel();
 		var design  = getDesignJavascript();
 		if (!design) return;
-        generatePDF(invoice, design, false, cb);
+    generatePDF(invoice, design, false, cb);
 	}
 
 	function getDesignJavascript() {
@@ -730,10 +730,12 @@
 			var invoice = createInvoiceModel();
 			var design  = getDesignJavascript();
 			if (!design) return;
-			var doc = generatePDF(invoice, design, true);
 			
-			$('form.form-horizontal.warn-on-exit').append('<input type="hidden" name="pdfupload" value="'+doc.output('datauristring')+'">');
-			submitAction('');
+      generatePDF(invoice, design, true, function(pdfString){
+        $('form.form-horizontal.warn-on-exit').append('<input type="hidden" name="pdfupload" value="'+pdfString+'">');
+        submitAction('');	    
+      });
+			
 		}
 	}
 
diff --git a/resources/views/invoices/history.blade.php b/resources/views/invoices/history.blade.php
index 8c490072b24c..4e4752b3dde1 100644
--- a/resources/views/invoices/history.blade.php
+++ b/resources/views/invoices/history.blade.php
@@ -13,7 +13,7 @@
     var currentInvoice = {{ $invoice }};
     var versionsJson = {{ $versionsJson }};
     
-    function getPDFString() {
+    function getPDFString(cb) {
 
         var version = $('#version').val();
         var invoice;
@@ -32,11 +32,7 @@
             invoiceDesign = invoiceDesigns[0];
         }
         
-        var doc = generatePDF(invoice, invoiceDesign.javascript, true);
-        if (!doc) {
-            return;
-        }
-        return doc.output('datauristring');
+        generatePDF(invoice, invoiceDesign.javascript, true, cb);
     }
 
     $(function() {   
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index 0f6f768343bf..508e4000846a 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -55,10 +55,8 @@
 			invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }};
 			invoice.contact = {!! $contact->toJson() !!};
 
-			function getPDFString() {
-	  	  var doc = generatePDF(invoice, invoice.invoice_design.javascript);
-				if (!doc) return;
-				return doc.output('datauristring');
+			function getPDFString(cb) {
+	  	  generatePDF(invoice, invoice.invoice_design.javascript, cb);
 			}
 
 			$(function() {