diff --git a/packages/vulcan-lib/lib/server/apollo_server.js b/packages/vulcan-lib/lib/server/apollo_server.js
index 0e917d6b8..3790cfe64 100644
--- a/packages/vulcan-lib/lib/server/apollo_server.js
+++ b/packages/vulcan-lib/lib/server/apollo_server.js
@@ -26,6 +26,7 @@ import { _hashLoginToken, _tokenExpiration } from './accounts_helpers';
 export let executableSchema;
 
 registerSetting('apolloEngine.logLevel', 'INFO', 'Log level (one of INFO, DEBUG, WARN, ERROR');
+registerSetting('apolloTracing', Meteor.isDevelopment, 'Tracing by Apollo. Default is true on development and false on prod', true);
 
 // see https://github.com/apollographql/apollo-cache-control
 const engineApiKey = getSetting('apolloEngine.apiKey');
@@ -145,7 +146,7 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
     }
 
     // enable tracing and caching
-    options.tracing = true;
+    options.tracing = getSetting('apolloTracing', Meteor.isDevelopment);
     options.cacheControl = true;
 
     // note: custom default resolver doesn't currently work
diff --git a/packages/vulcan-users/lib/modules/resolvers.js b/packages/vulcan-users/lib/modules/resolvers.js
index 80d49bcb3..8bec2f85e 100644
--- a/packages/vulcan-users/lib/modules/resolvers.js
+++ b/packages/vulcan-users/lib/modules/resolvers.js
@@ -39,7 +39,6 @@ const resolvers = {
 
       // get selector and options from terms and perform Mongo query
       let {selector, options} = await Users.getParameters(terms);
-      options.limit = (terms.limit < 1 || terms.limit > 100) ? 100 : terms.limit;
       options.skip = terms.offset;
       const users = await Connectors.find(Users, selector, options);