diff --git a/src/main/java/graphql/servlet/GraphQLWebsocketServlet.java b/src/main/java/graphql/servlet/GraphQLWebsocketServlet.java
index 0af5cabe..ba358b31 100644
--- a/src/main/java/graphql/servlet/GraphQLWebsocketServlet.java
+++ b/src/main/java/graphql/servlet/GraphQLWebsocketServlet.java
@@ -63,8 +63,8 @@ public GraphQLWebsocketServlet(GraphQLQueryInvoker queryInvoker, GraphQLInvocati
     @Override
     public void onOpen(Session session, EndpointConfig endpointConfig) {
         final WsSessionSubscriptions subscriptions = new WsSessionSubscriptions();
-        final HandshakeRequest request = (HandshakeRequest) session.getUserProperties().get(HANDSHAKE_REQUEST_KEY);
-        final SubscriptionProtocolHandler subscriptionProtocolHandler = (SubscriptionProtocolHandler) session.getUserProperties().get(PROTOCOL_HANDLER_REQUEST_KEY);
+        final HandshakeRequest request = (HandshakeRequest) endpointConfig.getUserProperties().get(HANDSHAKE_REQUEST_KEY);
+        final SubscriptionProtocolHandler subscriptionProtocolHandler = (SubscriptionProtocolHandler) endpointConfig.getUserProperties().get(PROTOCOL_HANDLER_REQUEST_KEY);
 
         synchronized (cacheLock) {
             if (isShuttingDown.get()) {