diff --git a/packages/vulcan-core/lib/modules/containers/withDocument.js b/packages/vulcan-core/lib/modules/containers/withDocument.js
index 8ddf7062e..f5133b327 100644
--- a/packages/vulcan-core/lib/modules/containers/withDocument.js
+++ b/packages/vulcan-core/lib/modules/containers/withDocument.js
@@ -36,9 +36,13 @@ export default function withDocument (options) {
   `, {
     alias: 'withDocument',
     
-    options(ownProps) {
+    options({ documentId, slug }) {
       const graphQLOptions = {
-        variables: { documentId: ownProps.documentId, slug: ownProps.slug, enableCache, currentUser: ownProps.currentUser },
+        variables: { 
+          documentId: documentId, 
+          slug: slug, 
+          enableCache, 
+        },
         pollInterval, // note: pollInterval can be set to 0 to disable polling (20s by default)
       };
 
diff --git a/packages/vulcan-core/lib/modules/containers/withList.js b/packages/vulcan-core/lib/modules/containers/withList.js
index b312521ea..5022ababc 100644
--- a/packages/vulcan-core/lib/modules/containers/withList.js
+++ b/packages/vulcan-core/lib/modules/containers/withList.js
@@ -122,7 +122,6 @@ const withList = (options) => {
             variables: {
               terms: mergedTerms,
               enableCache,
-              currentUser,
             },
             // note: pollInterval can be set to 0 to disable polling (20s by default)
             pollInterval,