diff --git a/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/extensions/requestExtensions.kt b/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/extensions/requestExtensions.kt
index 1bd6d2570b..38da8a4a20 100644
--- a/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/extensions/requestExtensions.kt
+++ b/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/extensions/requestExtensions.kt
@@ -36,7 +36,7 @@ fun GraphQLRequest.toExecutionInput(
         .extensions(this.extensions ?: emptyMap())
         .dataLoaderRegistry(dataLoaderRegistry ?: KotlinDataLoaderRegistry())
         .also { builder ->
-            graphQLContext?.let { builder.context(it) }
+            builder.context(graphQLContext)
             graphQLContextMap?.let { builder.graphQLContext(it) }
         }
         .build()
diff --git a/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/extensions/RequestExtensionsKtTest.kt b/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/extensions/RequestExtensionsKtTest.kt
index f01138cb45..b731f8b2ec 100644
--- a/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/extensions/RequestExtensionsKtTest.kt
+++ b/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/extensions/RequestExtensionsKtTest.kt
@@ -24,6 +24,7 @@ import org.dataloader.DataLoader
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 class RequestExtensionsKtTest {
@@ -80,6 +81,7 @@ class RequestExtensionsKtTest {
 
         val executionInput = request.toExecutionInput(graphQLContextMap = context)
         assertEquals(1, executionInput.graphQLContext.get("foo"))
+        assertNull(executionInput.context)
     }
 
     @Test