diff --git a/Netdisco/Changes b/Netdisco/Changes
index 2f5ce8a5..cd40de5b 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -8,6 +8,7 @@
   * Remove dupe restriction on job queue, try for smarter *all queuing (closes #41)
   * Remove scary message from Auth::Extensible (closes #38)
   * Return first port neighbor match, if multiple devices claim the IP (closes #42)
+  * Should handle empty ports preferences (closes #39)
 
 2.018000 - 2013-10-08
 
diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm
index f5853f92..63574069 100644
--- a/Netdisco/lib/App/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Device.pm
@@ -56,7 +56,7 @@ hook 'before' => sub {
 
   # override ports form defaults with cookie settings
 
-  my $cookie = cookie('nd_ports-form');
+  my $cookie = (cookie('nd_ports-form') || '');
   my $cdata = url_params_mixed($cookie);
 
   if ($cdata and ref {} eq ref $cdata and not param('reset')) {