diff --git a/lib/App/Netdisco/Web/Plugin/Inventory.pm b/lib/App/Netdisco/Web/Plugin/Inventory.pm
index cd5cd9ba..01636019 100644
--- a/lib/App/Netdisco/Web/Plugin/Inventory.pm
+++ b/lib/App/Netdisco/Web/Plugin/Inventory.pm
@@ -30,7 +30,6 @@ get '/inventory' => require_login sub {
 
     my %release_totals =
       map  { $_ => {rows => scalar @{ $release_map{$_} }, count => 0} }
-      grep { $_ }
            keys %release_map;
 
     foreach my $r (keys %release_totals) {
@@ -47,7 +46,6 @@ get '/inventory' => require_login sub {
 
     my %platform_totals =
       map  { $_ => {rows => scalar @{ $platform_map{$_} }, count => 0} }
-      grep { $_ }
            keys %platform_map;
 
     foreach my $r (keys %platform_totals) {
@@ -63,6 +61,8 @@ get '/inventory' => require_login sub {
       release_map  => \%release_map,
       platform_totals => \%platform_totals,
       release_totals  => \%release_totals,
+      unknown_platforms => (scalar grep { not $_->{vendor} } $platforms->hri->all),
+      unknown_releases => (scalar grep { not $_->{os} } $releases->hri->all),
     }, { layout => 'main' };
 };
 
diff --git a/share/views/inventory.tt b/share/views/inventory.tt
index aa58815e..57aee5e0 100644
--- a/share/views/inventory.tt
+++ b/share/views/inventory.tt
@@ -44,11 +44,9 @@
           <tr>
           [% END %]
             <th>
-              [% IF row.vendor %]
               <a class="nd_linkcell"
                 href="[% search_device | none %]&q=[% row.vendor | uri %]&vendor=[% row.vendor | uri %]">
                   [% row.vendor | html_entity %]</a>
-              [% ELSE %]unknown[% END %]
             </th>
             <th>
               [% IF row.model %]
@@ -61,6 +59,9 @@
           </tr>
           [% END %]
           [% END %]
+          [% IF unknown_platforms > 0 %]
+          <tr><th>Unknown</th><th>unknown</th><th>[% unknown_platforms %]</th></tr>
+          [% END %]
         </tbody>
       </table>
     </div>
@@ -108,11 +109,9 @@
           <tr>
           [% END %]
             <th>
-              [% IF row.os %]
               <a class="nd_linkcell"
                 href="[% search_device | none %]&q=[% row.os | uri %]&os=[% row.os | uri %]">
                   [% row.os | html_entity %]</a>
-              [% ELSE %]unknown[% END %]
             </th>
             <th>
               [% IF row.os_ver %]
@@ -125,6 +124,9 @@
           </tr>
           [% END %]
           [% END %]
+          [% IF unknown_releases > 0 %]
+          <tr><th>Unknown</th><th>unknown</th><th>[% unknown_releases %]</th></tr>
+          [% END %]
         </tbody>
       </table>
     </div>