diff --git a/app/Models/User.php b/app/Models/User.php
index 9581d1fa5..d6389d678 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -158,7 +158,7 @@ public function isInstanceAdmin()
     public function currentTeam()
     {
         return Cache::remember('team:' . auth()->user()->id, 3600, function () {
-            if (is_null(data_get(session('currentTeam'), 'id'))) {
+            if (is_null(data_get(session('currentTeam'), 'id')) && auth()->user()->teams->count() > 0){
                 return auth()->user()->teams[0];
             }
             return Team::find(session('currentTeam')->id);