diff --git a/Netdisco/Changes b/Netdisco/Changes
index d4b7299e..d04d33f4 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -18,6 +18,7 @@
 
   * Suggest installation of perl-core RPM (arguably Red Hat's bug not ours!)
   * FATAL warnings considered harmful
+  * Only show STP blocked icon if port is UP
 
 2.024004 - 2014-03-04
 
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index f24da989..fca9cf4f 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -20,7 +20,7 @@
       <td class="nd_center-cell nd_devport-icon">
         [% IF row.up_admin != 'up' %]
         <i class="icon-remove"></i>
-        [% ELSIF row.stp == 'blocking' %]
+        [% ELSIF row.up == 'up' AND row.stp == 'blocking' AND NOT row.vlan_count > 1 %]
         <i class="icon-fullscreen text-info"></i>
         [% ELSIF row.has_column_loaded('is_free') AND row.is_free %]
         <i class="icon-arrow-down text-success"></i>