diff --git a/Netdisco/Changes b/Netdisco/Changes
index f0f19074..32575c99 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -6,6 +6,10 @@
   * Add BSD install notes
   * Update IP Inventory to show MAC address and have working Last Used sort
 
+  [BUG FIXES]
+
+  * Fix for node search on some formats of IPv6 addr being seen as MAC
+
 2.029014 - 2014-11-19
 
   [ENHANCEMENTS]
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
index a4ef1280..6e370206 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
@@ -23,6 +23,7 @@ ajax '/ajax/content/search/node' => require_login sub {
     my ( $start, $end ) = param('daterange') =~ m/(\d+-\d+-\d+)/gmx;
 
     my $mac = NetAddr::MAC->new(mac => $node);
+    undef $mac if (defined $mac and $node =~ m/:{2}[a-f0-9]*$/i); # temp fix
     my @active = (param('archived') ? () : (-bool => 'active'));
 
     my @times = ();