diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/LessonTemplateResolver.java b/webgoat-container/src/main/java/org/owasp/webgoat/LessonTemplateResolver.java
index c00c9e062..22e7cc3c4 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/LessonTemplateResolver.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/LessonTemplateResolver.java
@@ -2,7 +2,6 @@ package org.owasp.webgoat;
 
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
-import org.owasp.webgoat.session.WebSession;
 import org.thymeleaf.TemplateProcessingParameters;
 import org.thymeleaf.resourceresolver.IResourceResolver;
 import org.thymeleaf.templateresolver.TemplateResolver;
@@ -20,12 +19,9 @@ public class LessonTemplateResolver extends TemplateResolver {
 
     private final static String PREFIX = "lesson:";
     private final File pluginTargetDirectory;
-    private final WebSession webSession;
 
-
-    public LessonTemplateResolver(File pluginTargetDirectory, WebSession webSession) {
+    public LessonTemplateResolver(File pluginTargetDirectory) {
         this.pluginTargetDirectory = pluginTargetDirectory;
-        this.webSession = webSession;
         setResourceResolver(new LessonResourceResolver());
         setResolvablePatterns(Sets.newHashSet(PREFIX + "*"));
     }
@@ -33,7 +29,6 @@ public class LessonTemplateResolver extends TemplateResolver {
     @Override
     protected String computeResourceName(TemplateProcessingParameters params) {
         String templateName = params.getTemplateName();
-
         return templateName.substring(PREFIX.length());
     }
 
@@ -41,8 +36,7 @@ public class LessonTemplateResolver extends TemplateResolver {
 
         @Override
         public InputStream getResourceAsStream(TemplateProcessingParameters params, String resourceName) {
-            String lessonName = webSession.getCurrentLesson().getClass().getSimpleName();
-            File lesson = new File(pluginTargetDirectory, "/plugin/" + lessonName + "/html/" + lessonName + ".html");
+            File lesson = new File(pluginTargetDirectory, "/plugin/" + resourceName + "/html/" + resourceName + ".html");
             if (lesson != null) {
                 try {
                     return new ByteArrayInputStream(Files.toByteArray(lesson));
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java b/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
index f3277a745..8b573d165 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
@@ -47,8 +47,8 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
     }
 
     @Bean
-    public LessonTemplateResolver lessonTemplateResolver(WebSession webSession) {
-        LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory, webSession);
+    public LessonTemplateResolver lessonTemplateResolver() {
+        LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory);
         resolver.setOrder(2);
         return resolver;
     }
diff --git a/webgoat-container/src/main/resources/templates/lesson_content.html b/webgoat-container/src/main/resources/templates/lesson_content.html
index 7388f328e..fbcb9692e 100644
--- a/webgoat-container/src/main/resources/templates/lesson_content.html
+++ b/webgoat-container/src/main/resources/templates/lesson_content.html
@@ -7,6 +7,6 @@
 <div id="message" class="info" th:utext="${message}"></div>
 <br/>
 <div th:utext="${lesson.content}"></div>
-<div th:replace="lesson:__${lesson}__"></div>
+<div th:replace="lesson:__${lesson.class.simpleName}__"></div>  <!-- __lesson__ makes Thymeleaf dynamic and calling the Thymeleaf resolver -->
 </html>