Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0d458a161ee50dd2db8283520b80b5cc559705bf -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0d458a161ee50dd2db8283520b80b5cc559705bf)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
@@ -437,4 +437,5 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.export.overall.summary = Overall summary
 label.monitoring.summary.time.limit.expired = Expired
-label.monitoring.discussion.start = Start discussion
\ No newline at end of file
+label.monitoring.discussion.start = Start discussion
+label.authoring.advance.discussion = Enable discussion sentiment voting in TBL monitoring
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20210511.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20210511.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20210511.sql	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5208 Add advanced option whether to show discussion widget in TBL monitoring
+
+ALTER TABLE tl_laasse10_assessment ADD COLUMN allow_discussion_sentiment TINYINT DEFAULT 0 AFTER allow_answer_justification;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r0dc158981713b0ab875102e364bd7c4a3a0e2235 -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 0dc158981713b0ab875102e364bd7c4a3a0e2235)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
@@ -142,6 +142,9 @@
     @Column(name = "allow_answer_justification")
     private boolean allowAnswerJustification;
 
+    @Column(name = "allow_discussion_sentiment")
+    private boolean allowDiscussionSentiment;
+
     @Column(name = "display_summary")
     private boolean displaySummary;
 
@@ -614,6 +617,14 @@
 	this.allowAnswerJustification = allowAnswerJustification;
     }
 
+    public boolean isAllowDiscussionSentiment() {
+	return allowDiscussionSentiment;
+    }
+
+    public void setAllowDiscussionSentiment(boolean allowDiscussionSentiment) {
+	this.allowDiscussionSentiment = allowDiscussionSentiment;
+    }
+
     public boolean isDisplaySummary() {
 	return displaySummary;
     }
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r57504156db251a3ca6eb0949f66c08304b11eb87 -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 57504156db251a3ca6eb0949f66c08304b11eb87)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
@@ -242,6 +242,13 @@
 </div>
 
 <div class="checkbox">
+	<label for="allowDiscussionSentiment">
+		<form:checkbox path="assessment.allowDiscussionSentiment" id="allowDiscussionSentiment"/>
+		<fmt:message key="label.authoring.advance.discussion" />
+	</label>
+</div>
+
+<div class="checkbox">
 	<label for="enable-confidence-levels">
 		<form:checkbox path="assessment.enableConfidenceLevels" id="enable-confidence-levels"/>
 		<fmt:message key="label.enable.confidence.levels" />
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -r121b31d41a88fa09201110f5c4c764048ce3c476 -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 121b31d41a88fa09201110f5c4c764048ce3c476)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
@@ -76,7 +76,7 @@
 		return false;
 	}
 
-	<c:if test="${param.embedded and empty toolSessionID}">
+	<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
 		function startDiscussionSentiment(toolQuestionUid, markAsActive) {
 			$('#discussion-sentiment-chart-panel-container-' + toolQuestionUid).load(
 				'${lams}learning/discussionSentiment/startMonitor.do',
@@ -155,11 +155,13 @@
 					</div>
 				</c:if>
 				
-				<div id="discussion-sentiment-start-button-${question.uid}"
-				     class="btn btn-xs btn-default pull-right discussion-sentiment-start-button"
-				     onClick="javascript:startDiscussionSentiment(${question.uid}, true)">
-					<i class="fa fa-comments"></i><fmt:message key="label.monitoring.discussion.start"/>
-				</div>
+				<c:if test="${assessment.allowDiscussionSentiment}">
+					<div id="discussion-sentiment-start-button-${question.uid}"
+					     class="btn btn-xs btn-default pull-right discussion-sentiment-start-button"
+					     onClick="javascript:startDiscussionSentiment(${question.uid}, true)">
+						<i class="fa fa-comments"></i><fmt:message key="label.monitoring.discussion.start"/>
+					</div>
+				</c:if>
 			</c:if>
 			
 			<h3 class="panel-title" style="margin-bottom: 10px;font-size: initial;">
@@ -290,7 +292,7 @@
 				</c:choose>
 			</c:if>
 			
-			<c:if test="${param.embedded and empty toolSessionID}">
+			<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
 				<div id="discussion-sentiment-chart-panel-container-${question.uid}"></div>
 			</c:if>
 		</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u -ree0c5d641711884aed6701e2ff45b25fb56a3a41 -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision ee0c5d641711884aed6701e2ff45b25fb56a3a41)
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
@@ -232,6 +232,22 @@
 		</tr>
 		<tr>
 			<td>
+				<fmt:message key="label.authoring.advance.discussion" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowDiscussionSentiment}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		<tr>
+			<td>
 				<fmt:message key="label.enable.confidence.levels" />
 			</td>