Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7 -r876e644c066e81c2721ffa085fd12f386e2f3bb6
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 876e644c066e81c2721ffa085fd12f386e2f3bb6)
@@ -36,26 +36,20 @@
 					keyboard: true
 				});
 
-				let websocket = initWebsocket('leaderSelection${toolSessionID}',
+				initWebsocket('leaderSelection${toolSessionID}',
 						'<lams:WebAppURL />'.replace('http', 'ws')
-						+ 'learningWebsocket?toolSessionID=${toolSessionID}');
+						+ 'learningWebsocket?toolSessionID=${toolSessionID}',
+						function (e) {
+							// create JSON object
+							var input = JSON.parse(e.data);
 
-				if (websocket) {
-					// when the server pushes new inputs
-					websocket.onmessage = function (e) {
-						// no need to reset ping timer as the only possible message is page refresh
-
-						// create JSON object
-						var input = JSON.parse(e.data);
-
-						// The leader has just been selected and all non-leaders should refresh their pages in order
-						// to see new leader's name and a Finish button.
-						if (input.pageRefresh) {
-							location.reload();
-							return;
-						}
-					};
-				}
+							// The leader has just been selected and all non-leaders should refresh their pages in order
+							// to see new leader's name and a Finish button.
+							if (input.pageRefresh) {
+								location.reload();
+								return;
+							}
+						});
 			});
 		
 			function leaderSelection() {