diff --git a/templates/hblink_table.html b/templates/hblink_table.html
index e34d809..6ceff3d 100644
--- a/templates/hblink_table.html
+++ b/templates/hblink_table.html
@@ -15,7 +15,7 @@
     </tr>
 
     {% for _master in _table['MASTERS'] %}    
-
+    {% if _table['MASTERS'][_master]['PEERS']|length >0 %}
     <tr style="background-color:#f9f9f9f9;">
         <td style="font-weight:bold" rowspan="{{ (_table['MASTERS'][_master]['PEERS']|length * 2) +1 }}"> {{_master}}<br><div style="font: 8pt arial, sans-serif">{{_table['MASTERS'][_master]['REPEAT']}}</div></td>
     </tr>
@@ -47,6 +47,7 @@
 
     </tr>    
     {% endfor %}
+     {% endif %}
 {% endfor %}
 </table>
  {% else %}
@@ -102,7 +103,7 @@
         <td style="font-weight:bold; padding-left: 20px; text-align:left;"> {{ _openbridge}} </td>
         <td><div style="font: 9pt arial, sans-serif;margin-top:3px;margin-bottom:3px;">Net ID: <span style="font: 9pt arial, sans-serif;font-weight:bold;">{{ _table['OPENBRIDGES'][_openbridge]['NETWORK_ID'] }}</td>
         <td style="background-color:#f9f9f9f9; font: 9pt arial, sans-serif; font-weight: 600; color:#464646;">{% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  %}(<span style="{{ 'color:#008000;' if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' else 'color:red;' }}">{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] }}</span>: <font color=#0065ff> {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1] }}</font> >> <font color=#b5651d> {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2] }}</font>) {% endfor %}</td>
-             </tr>
+   </tr>
     {% endfor %}
 </table>
     {% endif %}