diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLSingleInvocationInput.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLSingleInvocationInput.java
index 1acff407..f3e2fdb2 100644
--- a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLSingleInvocationInput.java
+++ b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLSingleInvocationInput.java
@@ -7,6 +7,7 @@
 import graphql.kickstart.execution.GraphQLRequest;
 import graphql.kickstart.execution.context.GraphQLContext;
 import graphql.schema.GraphQLSchema;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import javax.security.auth.Subject;
@@ -43,6 +44,7 @@ private ExecutionInput createExecutionInput(
         .query(graphQLRequest.getQuery())
         .operationName(graphQLRequest.getOperationName())
         .context(context)
+        .graphQLContext(Collections.singletonMap(context.getClass(), context))
         .root(root)
         .variables(graphQLRequest.getVariables())
         .extensions(graphQLRequest.getExtensions())