diff --git a/dist/pdf-invoice-simple.js b/dist/pdf-invoice-simple.js
index b925191..b91133d 100644
--- a/dist/pdf-invoice-simple.js
+++ b/dist/pdf-invoice-simple.js
@@ -127,7 +127,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 	function getTemplate(options) {
-	  var organizationAddress = options.organizationAddress || {};
+	  var organizationAddress = options.organizationAddress || null;
 	  var billingAddress = options.billingAddress || {};
 	  var date = options.date || (0, _moment2.default)();
 	  var dueDate = options.dueDate || (0, _moment2.default)().add(10, "days");
@@ -193,15 +193,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }]);
 	  }
 
+	  var organizationAddressText = organizationAddress ? getFlatAddressText(organizationAddress) : "";
+
 	  var doc = {
 	    defaultStyle: defaultStyle,
 	    content: [{
-	      text: returnAddressText({
-	        name: organizationAddress.name,
-	        street: organizationAddress.street,
-	        postCode: organizationAddress.postCode,
-	        city: organizationAddress.city
-	      }),
+	      text: organizationAddressText,
 	      margin: [0, 100, 0, 0],
 	      fontSize: 8,
 	      color: "gray"
@@ -316,7 +313,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return doc;
 	}
 
-	function returnAddressText(address) {
+	function getFlatAddressText(address) {
 	  var location = [address.postCode, address.city].join(" ").trim();
 
 	  return [address.name, address.street, location].filter(function (value) {
diff --git a/package.json b/package.json
index f1472b4..cdf392c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pdf-invoice-simple",
   "description": "A simple pdf invoice template",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": "Orbin",
   "keywords": [
     "pdf",
diff --git a/src/index.js b/src/index.js
index 9a1ab61..938b989 100644
--- a/src/index.js
+++ b/src/index.js
@@ -65,7 +65,7 @@ export default (options) => {
 };
 
 function getTemplate(options) {
-  const organizationAddress = options.organizationAddress || {};
+  const organizationAddress = options.organizationAddress || null;
   const billingAddress = options.billingAddress || {};
   const date = options.date || moment();
   const dueDate = options.dueDate || moment().add(10, "days");
@@ -135,15 +135,12 @@ function getTemplate(options) {
     ]);
   }
 
+  const organizationAddressText = organizationAddress ? getFlatAddressText(organizationAddress) : "";
+
   const doc = {
     defaultStyle: defaultStyle,
     content: [{
-      text: returnAddressText({
-        name: organizationAddress.name,
-        street: organizationAddress.street,
-        postCode: organizationAddress.postCode,
-        city: organizationAddress.city
-      }),
+      text: organizationAddressText,
       margin: [0, 100, 0, 0],
       fontSize: 8,
       color: "gray"
@@ -274,7 +271,7 @@ function getTemplate(options) {
   return doc;
 }
 
-function returnAddressText(address) {
+function getFlatAddressText(address) {
   const location = [address.postCode, address.city].join(" ").trim();
 
   return [address.name, address.street, location].filter((value) => {