diff --git a/sapl/templates/materia/em_lote/acessorio.html b/sapl/templates/materia/em_lote/acessorio.html
index f767ba167..bdc2148ee 100644
--- a/sapl/templates/materia/em_lote/acessorio.html
+++ b/sapl/templates/materia/em_lote/acessorio.html
@@ -79,7 +79,7 @@
             <div class="controls">
 					<div class="checkbox">
 						<label for="id_check_all">
-							<input type="checkbox" id="id_check_all" onchange="checkAll(event)" /> Marcar/Desmarcar Todos
+							<input type="checkbox" id="id_check_all" onchange="checkAll(this)" /> Marcar/Desmarcar Todos
 						</label>
 					</div>
 			</div>
@@ -109,11 +109,13 @@
 {% endblock detail_content %}
 {% block extra_js %}
 	<script language="JavaScript">
-		function checkAll(event) {
-			$('[name=materia_id]').each(function() {
-				$(this).prop('checked', event.target.checked ? 'checked': null);
-				$(this).trigger('click');
-			});
-		}
+		function checkAll(elem) {
+      let checkboxes = document.getElementsByName('materia_id');
+      for (let i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') 
+            checkboxes[i].checked = elem.checked;
+      }
+      
+    }
 	</script>
 {% endblock %}
diff --git a/sapl/templates/sessao/votacao/votacao_bloco_expediente.html b/sapl/templates/sessao/votacao/votacao_bloco_expediente.html
index 00acfd23f..7ca074645 100644
--- a/sapl/templates/sessao/votacao/votacao_bloco_expediente.html
+++ b/sapl/templates/sessao/votacao/votacao_bloco_expediente.html
@@ -110,35 +110,16 @@
   <script language="JavaScript">
 		function checkAll(elem) {
       let checkboxes = document.getElementsByName('marcadas_1');
-      if (elem.checked) {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = true;
-             }
-         }
-     } else {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = false;
-             }
-         }
-     }
-
+      for (let i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') 
+            checkboxes[i].checked = elem.checked;
+      }
+     
       checkboxes = document.getElementsByName('marcadas_2');
-      if (elem.checked) {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = true;
-             }
-         }
-     } else {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = false;
-             }
-         }
-     }
-
+      for (let i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') 
+            checkboxes[i].checked = elem.checked;
+      }
 		}
     
     function alteraTipoVotacao() {
diff --git a/sapl/templates/sessao/votacao/votacao_bloco_ordem.html b/sapl/templates/sessao/votacao/votacao_bloco_ordem.html
index df00d5e9d..e80695d00 100644
--- a/sapl/templates/sessao/votacao/votacao_bloco_ordem.html
+++ b/sapl/templates/sessao/votacao/votacao_bloco_ordem.html
@@ -110,35 +110,16 @@
   <script language="JavaScript">
 		function checkAll(elem) {
       let checkboxes = document.getElementsByName('marcadas_1');
-      if (elem.checked) {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = true;
-             }
-         }
-     } else {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = false;
-             }
-         }
-     }
-
+      for (let i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') 
+            checkboxes[i].checked = elem.checked; 
+      }
+     
       checkboxes = document.getElementsByName('marcadas_2');
-      if (elem.checked) {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = true;
-             }
-         }
-     } else {
-         for (let i = 0; i < checkboxes.length; i++) {
-             if (checkboxes[i].type == 'checkbox') {
-                 checkboxes[i].checked = false;
-             }
-         }
-     }
-
+      for (let i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') 
+            checkboxes[i].checked = elem.checked;
+      }
 		}
     
     function alteraTipoVotacao() {