diff --git a/server/src/graphql/resolvers.js b/server/src/graphql/resolvers.js
index 863d9f3e6..394fb9595 100644
--- a/server/src/graphql/resolvers.js
+++ b/server/src/graphql/resolvers.js
@@ -22,9 +22,16 @@ const resolvers = {
     available: (_, _args, { Event, Db, perms }) => {
       const data = {
         pokemon: perms.pokemon ? Event.available.pokemon : [],
-        gyms: perms.gyms ? Event.available.gyms : [],
+        gyms: perms.gyms || perms.raids ? Event.available.gyms : [],
         nests: perms.nests ? Event.available.nests : [],
-        pokestops: perms.pokestops ? Event.available.pokestops : [],
+        pokestops:
+          perms.pokestops ||
+          perms.invasions ||
+          perms.eventStops ||
+          perms.quests ||
+          perms.lures
+            ? Event.available.pokestops
+            : [],
         questConditions: perms.quests ? Db.questConditions : {},
         masterfile: { ...Event.masterfile, invasions: Event.invasions },
         filters: buildDefaultFilters(perms, Db),