diff --git a/RIGS/templates/partials/event_row.html b/RIGS/templates/partials/event_row.html
index 5ca01d67..599443e6 100644
--- a/RIGS/templates/partials/event_row.html
+++ b/RIGS/templates/partials/event_row.html
@@ -82,6 +82,7 @@
                         {% endif %}
 
 
+                        {% if event.is_rig %}
                         <div class="mb-3">
                             <small class="text-muted">Client:</small>
                             <p class="mb-1">
@@ -97,8 +98,9 @@
                                 {% endif %}
                             </p>
                         </div>
+                        {% endif %}
 
-
+                        {% if event.mic or event.needs_mic %}
                         <div class="mb-3">
                             <small class="text-muted">Member in Charge (MIC):</small>
                             <div class="d-flex align-items-center mt-1">
@@ -119,6 +121,7 @@
                                 {% endif %}
                             </div>
                         </div>
+                        {% endif %}
                     </div>