diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java
index 44ec701ee..1732cfe22 100644
--- a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java
+++ b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java
@@ -519,9 +519,7 @@ public JspConfigDescriptor getJspConfigDescriptor() {
 
     @Override
     public ClassLoader getClassLoader() {
-        // for the time being we return the default class loader. We may want to let developers override this int the
-        // future.
-        return ClassLoader.getSystemClassLoader();
+        return getClass().getClassLoader();
     }