diff --git a/symposion_project/templates/dashboard.html b/symposion_project/templates/dashboard.html
index d454e15d..09ef8257 100644
--- a/symposion_project/templates/dashboard.html
+++ b/symposion_project/templates/dashboard.html
@@ -122,53 +122,54 @@
             </p>
         </div>
     </div>
-
-    <div class="dashboard-panel">
-        <div class="dashboard-panel-header">
-            <i class="icon-group"></i>
-            <h3>{% trans "Teams" %}</h3>
+    
+    {% available_teams as available_teams %}
+    {% if user.memberships.exists or available_teams %}
+        <div class="dashboard-panel">
+            <div class="dashboard-panel-header">
+                <i class="icon-group"></i>
+                <h3>{% trans "Teams" %}</h3>
+            </div>
+            
+            <div class="dashboard-panel-content">
+                {% if user.memberships.exists %}
+                    <h4>Your Teams</h4>
+                    <table class="table table-striped">
+                        {% for membership in user.memberships.all %}
+                            <tr>
+                                <td>
+                                    <a href="{% url team_detail membership.team.slug %}">{{ membership.team.name }}</a>
+                                    {% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
+                                </td>
+                                <td>
+                                    <span class="label{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
+                                </td>
+                                <td>
+                                    {% if membership.state == "manager" or user.is_staff %}
+                                        {% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                {% endif %}
+                {% if available_teams %}
+                    <h4>Available Teams</h4>
+                    <table class="table table-striped">
+                        {% for team in available_teams %}
+                            <tr>
+                                <td>
+                                    <a href="{% url team_detail team.slug %}">{{ team }}</a>
+                                    {% if team.description %}<br>{{ team.description }}{% endif %}
+                                </td>
+                                <td>
+                                    <span class="label">{{ team.get_access_display }}</span>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                {% endif %}
+            </div>
         </div>
-        
-        <div class="dashboard-panel-content">
-            {% if user.memberships.exists %}
-                <h4>Your Teams</h4>
-                <table class="table table-striped">
-                    {% for membership in user.memberships.all %}
-                        <tr>
-                            <td>
-                                <a href="{% url team_detail membership.team.slug %}">{{ membership.team.name }}</a>
-                                {% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
-                            </td>
-                            <td>
-                                <span class="label{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
-                            </td>
-                            <td>
-                                {% if membership.state == "manager" or user.is_staff %}
-                                    {% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            {% endif %}
-            {% available_teams as available_teams %}
-            {% if available_teams %}
-                <h4>Available Teams</h4>
-                <table class="table table-striped">
-                    {% for team in available_teams %}
-                        <tr>
-                            <td>
-                                <a href="{% url team_detail team.slug %}">{{ team }}</a>
-                                {% if team.description %}<br>{{ team.description }}{% endif %}
-                            </td>
-                            <td>
-                                <span class="label">{{ team.get_access_display }}</span>
-                            </td>
-                        </tr>
-
-                    {% endfor %}
-                </table>
-            {% endif %}
-        </div>
-    </div>
+    {% endif %}
 {% endblock %}