diff --git a/models/team.js b/models/team.js
index 4d5d33c3b..b39298cd7 100644
--- a/models/team.js
+++ b/models/team.js
@@ -123,7 +123,7 @@ if (Meteor.isServer) {
         check(teamWebsite, String);
         check(teamIsActive, Boolean);
 
-        const nTeamNames = Team.find({ teamShortName }).count();
+        const nTeamNames = ReactiveCache.getTeams({ teamShortName }).length;
         if (nTeamNames > 0) {
           throw new Meteor.Error('teamname-already-taken');
         } else {
@@ -149,7 +149,7 @@ if (Meteor.isServer) {
       check(teamShortName, String);
       check(teamWebsite, String);
       check(teamIsActive, Boolean);
-      const nTeamNames = Team.find({ teamShortName }).count();
+      const nTeamNames = ReactiveCache.getTeams({ teamShortName }).length;
       if (nTeamNames > 0) {
         throw new Meteor.Error('teamname-already-taken');
       } else {