diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts
index 7bc490cd087..6c3d6563d4f 100644
--- a/packages/apollo-server-core/src/runHttpQuery.ts
+++ b/packages/apollo-server-core/src/runHttpQuery.ts
@@ -27,7 +27,7 @@ function isQueryOperation(query: DocumentNode, operationName: string) {
   return operationAST.operation === 'query';
 }
 
-export function isFunction(arg: any): arg is Function {
+function isFunction(arg: any): arg is Function {
   return typeof arg === 'function';
 }
 
@@ -101,11 +101,11 @@ export async function runHttpQuery(handlerArguments: Array<any>, request: HttpQu
         }
       }
 
-      let context = optionsObject.context;
+      let context = optionsObject.context || {};
       if (isFunction(context)) {
         context = context();
       } else if (isBatch) {
-        context = Object.assign({}, context || {});
+        context = Object.assign({}, Object.getPrototypeOf(context), context);
       }
 
       let params = {
diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts
index 69c58604c79..d4731bea28c 100644
--- a/packages/apollo-server-integration-testsuite/src/index.ts
+++ b/packages/apollo-server-integration-testsuite/src/index.ts
@@ -522,9 +522,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
           });
       });
 
-       it('executes batch context if it is a function', () => {
+       it('executes batch context if it is a function', async () => {
            let callCount = 0;
-           app = createApp({graphqlOptions: {
+           app = await createApp({graphqlOptions: {
                schema,
                context: () => {
                    callCount++;