Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -ra5725da4ffd404829baffc9c3f262f001daa41b9 -rdb599324881fb550c8645c904483d48ffe9f237d
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a5725da4ffd404829baffc9c3f262f001daa41b9)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision db599324881fb550c8645c904483d48ffe9f237d)
@@ -97,10 +97,15 @@
 					var grade = selects.length == 0 ? 0 : eval(selects.first().find('option:last-child').val())
 					var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
 					
-					var textareaValue = $("#question" + questionIndex + "__lamstextarea").val();
 
-					var isButtonEnabled = (totalSelected == grade) && $.trim(textareaValue);
+					var isButtonEnabled = (totalSelected == grade);
 					
+					//check if hedging justification is enabled
+					var justificationTextarea = $("#question" + questionIndex + "__lamstextarea");
+					if( justificationTextarea.length) {
+						isButtonEnabled = isButtonEnabled && $.trim(justificationTextarea.val());
+					}
+					
 					//if totalSelected equals to question's grade - show button
 					if (isButtonEnabled) {
 						$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "").removeClass("button-disabled");
@@ -450,12 +455,10 @@
 					} else {
 						var grade = ${question.grade};
 						var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
-
-				        var justificationTextareaValue = $("#question" + questionIndex + "__lamstextarea").val();
 				
 						//if totalSelected not equals to question's grade OR textarea is empty or contains only white-space - show warning
 						if (totalSelected != grade
-								|| !$.trim(justificationTextareaValue)) {
+								|| ${question.hedgingJustificationEnabled} && !$.trim($("#question" + questionIndex + "__lamstextarea").val())) {
 							markHedgingWrongTotalQuestions.push("${status.index}");
 						}
 					}