diff --git a/webgoat-container/src/main/resources/static/js/goatApp/view/MenuView.js b/webgoat-container/src/main/resources/static/js/goatApp/view/MenuView.js
index d71bf8c3e..b90640e3c 100644
--- a/webgoat-container/src/main/resources/static/js/goatApp/view/MenuView.js
+++ b/webgoat-container/src/main/resources/static/js/goatApp/view/MenuView.js
@@ -108,7 +108,9 @@ define(['jquery',
 		},
 
 		onLessonClick: function (elementId) {
-			$('#'+this.curLessonLinkId).removeClass('selected').parent().removeClass('selected');
+			if (this.curLessonLinkId) {
+				$('#'+this.curLessonLinkId).removeClass('selected').parent().removeClass('selected');
+			}
 			//update
 			$('#'+elementId).addClass('selected').parent().addClass('selected');
 			this.curLessonLinkId = elementId;