diff --git a/var/www/templates/crawler/crawler_splash/table_cookiejar.html b/var/www/templates/crawler/crawler_splash/table_cookiejar.html
index a773ddc9..0482acb1 100644
--- a/var/www/templates/crawler/crawler_splash/table_cookiejar.html
+++ b/var/www/templates/crawler/crawler_splash/table_cookiejar.html
@@ -34,7 +34,11 @@
                 {% endif %}
             {% endif %}
         </td>
-        <td>{{dict_cookiejar['org_name']}}<br>{{ dict_cookiejar['org'] }}</td>
+        <td>
+            {% if dict_cookiejar['org'] %}
+                {{dict_cookiejar['org_name']}}<br>{{ dict_cookiejar['org'] }}
+            {% endif %}
+        </td>
         <td>{{dict_cookiejar['user']}}</td>
       </tr>
     {% endfor %}
diff --git a/var/www/templates/hunter/tracker_show.html b/var/www/templates/hunter/tracker_show.html
index add8fbcf..7d71f12d 100644
--- a/var/www/templates/hunter/tracker_show.html
+++ b/var/www/templates/hunter/tracker_show.html
@@ -133,7 +133,11 @@
                                 </tr>
                                 <tr>
                                     <td class="text-right"><b>Org</b></td>
-                                    <td>{{meta['org_name']}}<br>{{ meta['org'] }}</td>
+                                    <td>
+                                        {% if meta['org'] %}
+                                            {{meta['org_name']}}<br>{{ meta['org'] }}
+                                        {% endif %}
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td class="text-right"><b>First Seen</b></td>
diff --git a/var/www/templates/hunter/trackersManagement.html b/var/www/templates/hunter/trackersManagement.html
index 7903f728..5c5e8537 100644
--- a/var/www/templates/hunter/trackersManagement.html
+++ b/var/www/templates/hunter/trackersManagement.html
@@ -94,7 +94,9 @@
                                     </div>
                                 </td>
                                 <td>
-                                    {{ dict_uuid['org_name'] }}<br>{{ dict_uuid['org'] }}
+                                    {% if dict_uuid['org'] %}
+                                        {{ dict_uuid['org_name'] }}<br>{{ dict_uuid['org'] }}
+                                    {% endif %}
                                 </td>
                                 <td>
                                     {% if dict_uuid['first_seen'] %}
@@ -243,7 +245,9 @@
                                     </div>
                                 </td>
                                 <td>
-                                    {{ dict_uuid['org_name'] }}<br>{{ dict_uuid['org'] }}
+                                    {% if dict_uuid['org'] %}
+                                        {{ dict_uuid['org_name'] }}<br>{{ dict_uuid['org'] }}
+                                    {% endif %}
                                 </td>
                                 <td>
                                     {% if dict_uuid['first_seen'] %}
diff --git a/var/www/templates/investigations/investigations.html b/var/www/templates/investigations/investigations.html
index f5219612..0943a735 100644
--- a/var/www/templates/investigations/investigations.html
+++ b/var/www/templates/investigations/investigations.html
@@ -58,7 +58,9 @@
                                     </div>
                                 </a>
                             </td>
-                            <td>{{ dict_investigation['org_name']}}<br>{{ dict_investigation['org'] }}</td>
+                            <td>
+                                {{ dict_investigation['org_name']}}<br>{{ dict_investigation['org'] }}
+                            </td>
                             <td>{{ dict_investigation['date']}}</td>
                             <td>{{ dict_investigation['last_change']}}</td>
                             <td>{{ dict_investigation['info']}}</td>
@@ -96,7 +98,11 @@
                                     </div>
                                 </a>
                             </td>
-                            <td>{{ dict_investigation['org_name']}}<br>{{ dict_investigation['org'] }}</td>
+                            <td>
+                                {% if dict_investigation['org'] %}
+                                    {{ dict_investigation['org_name']}}<br>{{ dict_investigation['org'] }}
+                                {% endif %}
+                            </td>
                             <td>{{ dict_investigation['date']}}</td>
                             <td>{{ dict_investigation['last_change']}}</td>
                             <td>{{ dict_investigation['info']}}</td>
diff --git a/var/www/templates/investigations/view_investigation.html b/var/www/templates/investigations/view_investigation.html
index e9d87ea3..a21b474e 100644
--- a/var/www/templates/investigations/view_investigation.html
+++ b/var/www/templates/investigations/view_investigation.html
@@ -49,7 +49,11 @@
 				            </tr>
                             <tr>
 				              <th>Org</th>
-				              <td>{{metadata['org_name']}}<br>{{ metadata['org'] }}</td>
+                              <td>
+                                {% if metadata['org'] %}
+                                    {{ metadata['org_name']}}<br>{{ metadata['org'] }}
+                                {% endif %}
+                            </td>
 				            </tr>
                             <tr>
                                 <th>Level</th>