diff --git a/Netdisco/Changes b/Netdisco/Changes
index f6222763..2bb511ca 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -22,6 +22,7 @@
   * Improve security of REMOTE_USER handling (B. Marshall)
   * portcontrol and power jobs using device instance instead of IP address
   * [#266] netdisco subnet utiiization report div by zero (V. Puchkov)
+  * Missing display name for device when device has no DNS
 
 2.033006 - 2016-03-20
 
diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm
index 1dc5e2fa..dedad193 100644
--- a/Netdisco/lib/App/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Device.pm
@@ -157,10 +157,10 @@ hook 'before_template' => sub {
 
 get '/device' => require_login sub {
     my $q = param('q');
-    my $schema = schema('netdisco')->resultset('Device');
+    my $devices = schema('netdisco')->resultset('Device');
 
     # we are passed either dns or ip
-    my $dev = $schema->search({
+    my $dev = $devices->search({
         -or => [
             \[ 'host(me.ip) = ?' => [ bind_value => $q ] ],
             'me.dns' => $q,
@@ -174,11 +174,11 @@ get '/device' => require_login sub {
     # if passed dns, need to check for duplicates
     # and use only ip for q param, if there are duplicates.
     my $first = $dev->first;
-    my $others = ($schema->search({dns => $first->dns})->count() - 1);
+    my $others = ($devices->search({dns => $first->dns})->count() - 1);
 
     params->{'tab'} ||= 'details';
     template 'device', {
-      display_name => ($others ? $first->ip : $first->dns),
+      display_name => ($others ? $first->ip : ($first->dns || $first->ip)),
       device => params->{'tab'},
     };
 };