diff --git a/src/components/CardRenderer.js b/src/components/CardRenderer.js
index 71c6f72a..bffb2323 100644
--- a/src/components/CardRenderer.js
+++ b/src/components/CardRenderer.js
@@ -22,7 +22,7 @@ module.exports.renderDefaultCard = function renderDefaultCard({item}) {
               <div class="mosaic-info">
                 <div class="mosaic-title">
                   <h5>${item.display_name ? h(item.display_name) : h(item.name)}</h5>
-                  ${h(item.organization)}
+                  ${item.organization ? h(item.organization) : ""}
                 </div>
                 <div class="mosaic-stars">
                   ${_.isNumber(item.stars) && item.stars ?
diff --git a/src/components/ItemDialogContentRenderer.js b/src/components/ItemDialogContentRenderer.js
index 0b764aac..62626aca 100644
--- a/src/components/ItemDialogContentRenderer.js
+++ b/src/components/ItemDialogContentRenderer.js
@@ -653,8 +653,8 @@ module.exports.render = function({settings, tweetsCount, itemInfo}) {
   const productInfo = `
     <div class="product-main">
         <div class="product-name">${h(itemInfo.name)}</div>
-        <div class="product-parent"><a data-type=internal href="${linkToOrganization}">
-          <span>${h(itemInfo.organization)}</span>${renderMemberTag(itemInfo)}</a></div>
+        ${itemInfo.organization ? `<div class="product-parent"><a data-type=internal href="${linkToOrganization}">
+          <span>${h(itemInfo.organization)}</span>${renderMemberTag(itemInfo)}</a></div>` : ""}
         ${productPaths.map( (productPath) => `
           <div class="product-category">${renderItemCategory({path: productPath, itemInfo})}</div>
         `).join('')}