diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs
index 50a83cb30..1cb240817 100644
--- a/frontend/src/app/main/ui/dashboard/team.cljs
+++ b/frontend/src/app/main/ui/dashboard/team.cljs
@@ -692,8 +692,11 @@
      [:& header {:section :dashboard-team-invitations
                  :team team}]
      [:section {:class (stl/css :dashboard-container :dashboard-team-invitations)}
-      [:& invitation-section {:team team
-                              :invitations invitations}]]]))
+      ;; TODO: We should consider adding a "loading state" here
+      ;; with an (if (nil? invitations) [:& loading-state] [:& invitations])
+      (when-not (nil? invitations)
+        [:& invitation-section {:team team
+                                :invitations invitations}])]]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; WEBHOOKS SECTION